Remove gnuconfig eclass usage, bug#160184

Package-Manager: portage-2.1.1-r2

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index cfa66c23b2b3d6fa9da081716465591996c51f38..31b14f382788a5deb39de38872cfaebe14e02cdf 100644 (file)
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.60 2006/12/21 22:13:23 alonbl Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.61 2007/01/05 21:43:27 alonbl Exp $
+
+*nspr-4.6.4-r1 (05 Jan 2007)
+
+  05 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/nspr-4.6.4-config-2.patch, +nspr-4.6.4-r1.ebuild:
+  Remove gnuconfig eclass usage, bug#160184
 
 *nspr-4.6.4 (21 Dec 2006)
 

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 443d698bd06ae29f7697b93ff40bd47b43f0ea6a..77f146197491e2bbe5a4d6c7479c16905eb2d83e 100644 (file)
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -34,6 +34,10 @@ AUX nspr-4.6.3-fbsd62.patch 560 RMD160 6bd439cb9b5d194d8e47b12aced23a7649468e72
 MD5 03f3d90557cfc278618911d4741e79d8 files/nspr-4.6.3-fbsd62.patch 560
 RMD160 6bd439cb9b5d194d8e47b12aced23a7649468e72 files/nspr-4.6.3-fbsd62.patch 560
 SHA256 8ba1abac80e24a96650ef9d6e821b03d874a97f819c4e422cf1904331a28ef1d files/nspr-4.6.3-fbsd62.patch 560
+AUX nspr-4.6.4-config-2.patch 998 RMD160 49459612cdd9f8e61d5edc208511f7cdc2b95dc7 SHA1 aeb282781b017051e8f28efaf9fd0ad4727283b1 SHA256 d6df8b638240fdbd0361a8773666e537d5d0654d3dd1b1decb70fb5eef484da7
+MD5 655221e6fb9eb61cc9069d0b8573562b files/nspr-4.6.4-config-2.patch 998
+RMD160 49459612cdd9f8e61d5edc208511f7cdc2b95dc7 files/nspr-4.6.4-config-2.patch 998
+SHA256 d6df8b638240fdbd0361a8773666e537d5d0654d3dd1b1decb70fb5eef484da7 files/nspr-4.6.4-config-2.patch 998
 AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bcdb0618418aaa0d3fb82a3d0475b9098a SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639
 MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250
 RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250
@@ -82,14 +86,18 @@ EBUILD nspr-4.6.3.ebuild 2682 RMD160 b28e8faf7cb24e817aaa8dddfe69f607cfd090bf SH
 MD5 9703684db28cd8503316d8971bf5d95a nspr-4.6.3.ebuild 2682
 RMD160 b28e8faf7cb24e817aaa8dddfe69f607cfd090bf nspr-4.6.3.ebuild 2682
 SHA256 dc2755fe55af67f15f9a78c5edb16d207cd2c901bb00743d67c5ffe53015163d nspr-4.6.3.ebuild 2682
+EBUILD nspr-4.6.4-r1.ebuild 2848 RMD160 42380aa7594982ff08693dd23f3a66c1fbc1884f SHA1 25ea70d6ea4a8a93d0d0bc99c075df6290a34290 SHA256 a4151e7d0c89547a3628900e1bb090122999c93c1942c48b23d9b7119f527459
+MD5 b4e9155bb763e57b25be337e1b00dcd1 nspr-4.6.4-r1.ebuild 2848
+RMD160 42380aa7594982ff08693dd23f3a66c1fbc1884f nspr-4.6.4-r1.ebuild 2848
+SHA256 a4151e7d0c89547a3628900e1bb090122999c93c1942c48b23d9b7119f527459 nspr-4.6.4-r1.ebuild 2848
 EBUILD nspr-4.6.4.ebuild 2673 RMD160 2dad78f8a43f7d1c83fdcbe8eb57bb004b3618b3 SHA1 aa81814298220067fc284d343dbece44541e9a43 SHA256 206dc3fc22a0c919a303d2349f67281e424d0b1d67f4f0f26323ea91455c141a
 MD5 7d7b8f7cca82805663a9f63418818123 nspr-4.6.4.ebuild 2673
 RMD160 2dad78f8a43f7d1c83fdcbe8eb57bb004b3618b3 nspr-4.6.4.ebuild 2673
 SHA256 206dc3fc22a0c919a303d2349f67281e424d0b1d67f4f0f26323ea91455c141a nspr-4.6.4.ebuild 2673
-MISC ChangeLog 7223 RMD160 eaf7924a6a201023d2d92c4da0ad5780a8bf5a2b SHA1 4bf4370379ae7ca070bbb72e9dd6987f7807528c SHA256 eadfb2f513d7a02d4a5cd804294a8ffb3769b46f214ad707ec25437169ce4dd4
-MD5 f5fc8dfb654c4422de4182c00855bd47 ChangeLog 7223
-RMD160 eaf7924a6a201023d2d92c4da0ad5780a8bf5a2b ChangeLog 7223
-SHA256 eadfb2f513d7a02d4a5cd804294a8ffb3769b46f214ad707ec25437169ce4dd4 ChangeLog 7223
+MISC ChangeLog 7405 RMD160 94627391a170848e04f23f7a444b468253ae3ada SHA1 3ea48a9cd8253a010c1cca23ea834c46f1d9ca47 SHA256 3c4054e31bcb61bc7a227841ce7ad346a5da4c025c388657848e9cedfda2f814
+MD5 73f44c6002a097830c330ca93f40f76c ChangeLog 7405
+RMD160 94627391a170848e04f23f7a444b468253ae3ada ChangeLog 7405
+SHA256 3c4054e31bcb61bc7a227841ce7ad346a5da4c025c388657848e9cedfda2f814 ChangeLog 7405
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
 MD5 243e4cd9809545d12f991b2d417040e1 metadata.xml 159
 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 metadata.xml 159
@@ -124,3 +132,6 @@ SHA256 82d736986dd37fa8bff6a9c087f916915aff244b64f3f85350be22f901034203 files/di
 MD5 83bc2bf9a655a6a66e2afe98f90d0beb files/digest-nspr-4.6.4 235
 RMD160 cdf4e57770273ca3725c11b07edc2211dadf57ea files/digest-nspr-4.6.4 235
 SHA256 e746a0818aca650050828dbd68032dab6f443a9c6ac9b41fc261d9d6766b8240 files/digest-nspr-4.6.4 235
+MD5 83bc2bf9a655a6a66e2afe98f90d0beb files/digest-nspr-4.6.4-r1 235
+RMD160 cdf4e57770273ca3725c11b07edc2211dadf57ea files/digest-nspr-4.6.4-r1 235
+SHA256 e746a0818aca650050828dbd68032dab6f443a9c6ac9b41fc261d9d6766b8240 files/digest-nspr-4.6.4-r1 235

diff --git a/dev-libs/nspr/files/digest-nspr-4.6.4-r1 b/dev-libs/nspr/files/digest-nspr-4.6.4-r1
new file mode 100644 (file)
index 0000000..bda30b2
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.4-r1
@@ -0,0 +1,3 @@
+MD5 43db60ab2ff1599c17d3a3f55caa7d47 nspr-4.6.4.tar.gz 1301886
+RMD160 d893554bc49c13787ec33bd2c7580f51bf8e89ac nspr-4.6.4.tar.gz 1301886
+SHA256 49e12321adb3eacf8dac5f799ab52fb1a797021fcb2893736e7bfbd517a02413 nspr-4.6.4.tar.gz 1301886

diff --git a/dev-libs/nspr/files/nspr-4.6.4-config-2.patch b/dev-libs/nspr/files/nspr-4.6.4-config-2.patch
new file mode 100644 (file)
index 0000000..843927c
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.4-config-2.patch
@@ -0,0 +1,32 @@
+--- configure.in.org   2007-01-05 23:07:18.000000000 +0200
++++ configure.in       2007-01-05 23:37:36.000000000 +0200
+@@ -409,7 +409,8 @@ if test "$target" != "$host"; then
+ 
+     AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+     AC_TRY_COMPILE([], [return(0);], 
+-        [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])],
++        [ac_cv_prog_host_cc_works=1
++      AC_MSG_RESULT([yes])],
+         AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) )
+ 
+     CC=$_SAVE_CC
+@@ -2155,9 +2156,8 @@ case $target in
+ *-darwin*)
+     ;;
+ *)
+-    AC_CHECK_LIB(dl, dlopen,
+-        AC_CHECK_HEADER(dlfcn.h,
+-            OS_LIBS="-ldl $OS_LIBS"))
++    AC_CHECK_HEADER(dlfcn.h)
++    AC_CHECK_LIB(dl, dlopen, [OS_LIBS="-ldl $OS_LIBS"])
+     ;;
+ esac
+ 
+@@ -2766,6 +2766,7 @@ config/autoconf.mk
+ config/nsprincl.mk
+ config/nsprincl.sh
+ config/nspr-config
++config/nspr.pc
+ lib/Makefile 
+ lib/ds/Makefile 
+ lib/libc/Makefile 

diff --git a/dev-libs/nspr/nspr-4.6.4-r1.ebuild b/dev-libs/nspr/nspr-4.6.4-r1.ebuild
new file mode 100644 (file)
index 0000000..b2db745
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.4-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.4-r1.ebuild,v 1.1 2007/01/05 21:43:27 alonbl Exp $
+
+WANT_AUTOMAKE='latest'
+WANT_AUTOCONF='latest'
+
+inherit eutils autotools
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 debug"
+
+DEPEND=""
+S="${WORKDIR}/${P}/mozilla/nsprpub"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
+       EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
+       epatch "${FILESDIR}"/${PN}-4.6.4-config-2.patch
+       EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
+       EPATCH_OPTS="-p2" epatch "${FILESDIR}"/${PN}-4.6.1-prtime.patch
+       eautoreconf
+}
+
+src_compile() {
+       cd "${S}/build"
+
+       if use amd64 || use ppc64 || use ia64 || use s390; then
+               myconf="${myconf} --enable-64bit"
+       else
+               myconf=""
+       fi
+
+       if use ipv6; then
+               myconf="${myconf} --enable-ipv6"
+       fi
+
+       ../configure \
+               --build=${CBUILD:-${CHOST}} \
+               --host=${CHOST} \
+               --prefix=/usr \
+               --libdir=/usr/$(get_libdir)/nspr \
+               --infodir=/usr/share/info \
+               --mandir=/usr/share/man \
+               $(use_enable debug) \
+               ${myconf} || die "./configure failed"
+       make || die
+}
+
+src_install () {
+       # Their build system is royally fucked, as usual
+       MINOR_VERSION=6
+       cd ${S}/build
+       make install
+       insinto /usr
+       doins -r dist/*
+       rm -rf ${D}/usr/bin/lib*.so
+
+       #removing includes/nspr/md as per fedora spec
+       # i.e a waste of space!
+       rm -rf ${D}/usr/include/nspr/md
+
+       # there have been /usr/lib/nspr changes (like the ldpath below), but never
+       # have I seen any libraries end up in this directory. lets fix that.
+       # note: I tried doing this fix via the build system. It wont work.
+       if [ ! -e ${D}/usr/lib/nspr ] ; then
+               mkdir -p ${D}/usr/lib/nspr
+               mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
+               mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
+       fi
+       # and while we're at it, lets make it actually use the arch's libdir damnit
+       if [ "lib" != "$(get_libdir)" ] ; then
+               mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+       fi
+       #and while at it move them to files with versions-ending
+       #and link them back :)
+       cd ${D}/usr/$(get_libdir)/nspr
+       for file in *.so; do
+               mv ${file} ${file}.${MINOR_VERSION}
+               ln -s ${file}.${MINOR_VERSION} ${file}
+       done
+       # cope with libraries being in /usr/lib/nspr
+       dodir /etc/env.d
+       echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
+
+       # install nspr-config
+       insinto  /usr/bin
+       doins ${S}/build/config/nspr-config
+       chmod a+x ${D}/usr/bin/nspr-config
+
+       # create pkg-config file
+       insinto /usr/$(get_libdir)/pkgconfig/
+       doins ${S}/build/config/nspr.pc
+}