ports + eglibc removal

6 files changed, 23 insertions, 181 deletions

diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 9a7ebc1e5..04e22fd8a 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ipset
 pkgver=6.12.1
 pkgrel=2
 pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
 license=('GPL2')
 depends=('libmnl')
diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD
index bc4e355c2..5df9aa2a4 100644
--- a/community/libmnl/PKGBUILD
+++ b/community/libmnl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmnl
 pkgver=1.0.3
 pkgrel=1
 pkgdesc='Minimalistic user-space library oriented to Netlink developers.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libmnl/'
 license=('LGPL2.1')
 depends=('glibc')
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index a90b3a040..3a9762fc9 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -14,7 +14,10 @@ install=$pkgname.install
 depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
          'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
          'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+if [ "$CARCH" != "mips64el" ]; then
+depends+=('lirc-utils')
+fi
 makedepends=('mesa' 'unzip' 'yasm')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
@@ -24,10 +27,14 @@ source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
 md5sums=('814cc9545937e13796df1d4747c3c5d0')
 
 build() {
-    cd "${srcdir}/${_snapshot}"
+    cd "${srcdir}"/$pkgname-$pkgver
+
+    case $CARCH in
+        mips64el) ;;
+        *86*) extra=--enable-runtime-cpudetection;;
+    esac
 
     ./configure --prefix=/usr \
-                --enable-runtime-cpudetection \
                 --disable-speex \
                 --disable-openal \
                 --disable-libdv \
@@ -36,12 +43,13 @@ build() {
                 --language=all \
                 --enable-translation \
                 --confdir=/etc/mplayer \
+                $extra \
                 --disable-live  # Disabled by default in Uoti’s Git branch
     make
 }
 
 package() {
-    cd "${srcdir}/${_snapshot}"
+    cd "${srcdir}"/$pkgname-$pkgver
 
     make DESTDIR="${pkgdir}" install
     install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
diff --git a/core/eglibc/PKGBUILD b/core/eglibc/PKGBUILD
deleted file mode 100644
index 87ea5dc27..000000000
--- a/core/eglibc/PKGBUILD
+++ /dev/null
@@ -1,149 +0,0 @@
-# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each new glibc version
-
-pkgname=eglibc
-pkgver=2.13
-pkgrel=1
-_glibcdate=20110117
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=2.6.37' 'tzdata')
-makedepends=('gcc>=4.4')
-backup=(etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(http://repo.parabolagnulinux.org/other/eglibc-2_13.tar.bz2
-        http://repo.parabolagnulinux.org/other/eglibc-linuxthreads-2_13.tar.bz2
-        http://repo.parabolagnulinux.org/other/eglibc-localedef-2_13.tar.bz2
-        http://repo.parabolagnulinux.org/other/eglibc-ports-2_13.tar.bz2
-        nscd
-        locale.gen.txt
-        locale-gen)
-
-build() {
-  cd ${srcdir}
-  ln -s eglibc-2_13 eglibc 
-
-  cd eglibc
-
-  # timezone data is in separate package (tzdata)
-  sed -i "s/localedata //" Makeconfig 
-
-  for addon in ports ; do
-    ln -s ../eglibc-$addon-2_13 $addon 
-  done
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  cd ${srcdir}
-  mkdir build || true
-  cd build
-
-  if [[ ${CARCH} = "mips64el" ]]; then
-    # mips64el is only supported out of tree.
-    extra_addons=",ports"
-  fi
-
-  echo "slibdir=/lib" >> configparms
-
-  ${srcdir}/eglibc/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn$extra_addons \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --disable-multi-arch
-        
-  make
-}
-
-check() {
-  cd ${srcdir}/build
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-package() {
-  cd ${srcdir}/build
-  make install_root=${pkgdir} install
-
-  rm ${pkgdir}/etc/ld.so.{cache,conf}
-
-  install -dm755 ${pkgdir}/etc/rc.d
-  install -dm755 ${pkgdir}/usr/sbin
-  install -dm755 ${pkgdir}/usr/lib/locale
-  install -m644 ${srcdir}/eglibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-  install -m644 ${srcdir}/eglibc/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -i "s|/| |g" ${srcdir}/eglibc/localedata/SUPPORTED
-  sed -i 's|\\| |g' ${srcdir}/eglibc/localedata/SUPPORTED
-  sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/eglibc/localedata/SUPPORTED
-  cat ${srcdir}/eglibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-  sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix for the linker
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    # Comply with multilib binaries, they look for the linker in /lib64
-    mkdir ${pkgdir}/lib64
-    cd ${pkgdir}/lib64
-    ln -v -s ../lib/ld* .
-  fi
-  
-  # manually strip files as stripping libpthread-*.so and libthread_db.so
-  # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks
-  # valgrind on x86_64
-
-  cd $pkgdir
-  strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-                        usr/bin/{gencat,getconf,getent,iconv,locale} \
-                        usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
-                        usr/lib/getconf/* \
-                        usr/sbin/{iconvconfig,nscd,rpcinfo}
-  [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
-  strip $STRIP_STATIC usr/lib/*.a \
-                      lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so
-
-  strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \
-                      lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,gconv/*.so}
-}
-md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
-         '483f37cfdd619e81d8ca9e9d713944b5'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '24dfab6fd244f3773523412588ecc52c'
-         '7d0154b7e17ea218c9fa953599d24cc4'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-md5sums=('0f79580a194657aa74e3331d33a3889e'
-         'f07ce5e45308fc7e2faaa55f2c766550'
-         '40b693a9ce8ab0a8837826160b3419c9'
-         '973e16228492b46bf731ad5ce2e06e9f'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/core/eglibc/glibc-2.13-prelink.patch b/core/eglibc/glibc-2.13-prelink.patch
deleted file mode 100644
index bef7998a8..000000000
--- a/core/eglibc/glibc-2.13-prelink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 9a560b3..201c9cf 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-      we need it in the memory handling later.  */
-   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
- 
-+  /* Remember the last search directory added at startup, now that
-+     malloc will no longer be the one from dl-minimal.c.  */
-+  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
-+
-   if (prelinked)
-     {
-       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
-@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 			  lossage);
-     }
- 
--  /* Remember the last search directory added at startup, now that
--     malloc will no longer be the one from dl-minimal.c.  */
--  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
--
-   if (! prelinked && rtld_multiple_ref)
-     {
-       /* There was an explicit ref to the dynamic linker as a shared lib.
diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
index d6b6538d8..d73db5a9d 100644
--- a/extra/libbluray/PKGBUILD
+++ b/extra/libbluray/PKGBUILD
@@ -10,8 +10,10 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/developers/libbluray.html"
 license=('LGPL2.1')
 depends=('libxml2')
+if [ "$CARCH" != "mips64el" ]; then
 makedepends=('apache-ant' 'jdk7-openjdk')
 optdepends=('java-environment: Blu-ray Disc Java support library')
+fi
 options=(!libtool)
 source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a')
@@ -19,11 +21,16 @@ sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce
 build() {
   cd "$pkgname-$pkgver"
 
+if [ "$CARCH" != "mips64el" ]; then
   . /etc/profile.d/jdk.sh
   ./configure --prefix=/usr \
     --enable-bdjava \
     --with-jdk=${JAVA_HOME} \
     --disable-static
+else
+  ./configure --prefix=/usr \
+    --disable-static
+fi
   make
 }
 
@@ -31,7 +38,9 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   #install bdj
+if [ "$CARCH" != "mips64el" ]; then
   install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar"
+fi
 }
 
 # vim:set ts=2 sw=2 et: