Respect LDFLAGS, bug #181790, remove old

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686

5 files changed, 12 insertions, 175 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index fb809d60e918..15c07265c3da 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.105 2008/05/11 14:29:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.106 2008/08/13 16:57:20 armin76 Exp $
+
+  13 Aug 2008; Raúl Porcel <armin76@gentoo.org> -nspr-4.7.ebuild,
+  -nspr-4.7.1_beta2.ebuild, nspr-4.7.1.ebuild:
+  Respect LDFLAGS, bug #181790, remove old
 
 *nspr-4.7.1 (11 May 2008)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index fd9878981f74..eeebfcceaf69 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,12 +8,8 @@ AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bc
 DIST nspr-4.6.7.tar.gz 1303759 RMD160 11a0d8b14ebdd441f6899c464b77144704ab638e SHA1 cf45319d02285ec5479445a1e9adfb9e94f55a6a SHA256 314e078f954677f469f2a60e8aca8efa3dd1807f7e1a109cc688a2469e2e3b70
 DIST nspr-4.6.8.tar.gz 1313108 RMD160 da8b77c3b386adb82467613e0bcdbdf5f68369ea SHA1 ca0d7a940e1cf6cf6bd63680fedf090195d0b460 SHA256 47750e6a99e2570fa2119f21d5d201174282679352379a565e3e5a80453e48b1
 DIST nspr-4.7.1.tar.bz2 980527 RMD160 9eeb7c64ddee51a4647a9a518c02161a3937d2c0 SHA1 126d9507c6a05d547e61da49701618b61555b1b4 SHA256 3816016e1dc99e08d03a5fd8c1ee8657f69e7035d2503756a78bd833c3393957
-DIST nspr-4.7.1_beta2.tar.bz2 979582 RMD160 cf7fb152f9109023bd3bd55c51c169f02ffc1677 SHA1 42aa59ded17b692a3fcf1825eaccd7cbdec13c82 SHA256 294b50b259716e22b485a3a5b335d168dbb39a3c954710ab172243e86342ed75
-DIST nspr-4.7.tar.gz 1304632 RMD160 9a2f24e9bde6006dea4af2f6d0ff7a3f419df5f4 SHA1 5d65e7960cde2059bfbc854c47c1eb295b9a2198 SHA256 6662a33cd04dee12d3b85c195277d05b81f46ec22369589fe371dad06e681aff
 EBUILD nspr-4.6.7.ebuild 2691 RMD160 2c32737f8e3443fb277ceba6b061545c55ee05ef SHA1 0f49d79900bbbaa49c075fb3acf794accf11b58d SHA256 149c91da56f5385fca2edf1e21167f73bab6c45782981044230965153c562af0
 EBUILD nspr-4.6.8.ebuild 2728 RMD160 1d2c0f6ffe04f47014bb8308bde27139a480bb37 SHA1 c5b9cfc826f9c34436157d8b5020e562ab6993ad SHA256 596ab4392db28104c3ca965afffc3759f3a78ecaf6f773cc8c24fe0326364245
-EBUILD nspr-4.7.1.ebuild 2197 RMD160 6044fd521b5a0bf8ab090004be3137ae48d513b6 SHA1 bf1aae27ab1a23e4039ae26ae1b18e629ec934eb SHA256 70380ef18066eb18256659735abada9fb1b913ea80089c6c97c46d4ac81d2d53
-EBUILD nspr-4.7.1_beta2.ebuild 2203 RMD160 2963f742282c46fa8c05917ccd9de31776ab93b9 SHA1 2dc83aa0c8e8a150878db9bc38575aefad9f8957 SHA256 81ac7434eb1b1c565e973c8040bdb00df61892e05bfcc824e94e97ee18be701f
-EBUILD nspr-4.7.ebuild 2195 RMD160 6154009344f8d398a9303b72129c4ff9b1ba9763 SHA1 1113ac03fddc1c74be31f844f60057085090546a SHA256 a3078d83a1d0aebc97b9097cfb44185400fcc193408a08fcc5164e27c9a6a917
-MISC ChangeLog 13554 RMD160 2aaf73a51544cbf4978b2ca0487d61048a0e0026 SHA1 4ee35c6f34cbb5876660a3150229320a66d83671 SHA256 ed803052f80da95a493aa33436d7a6a4fab0f83f614e262b8d5ca2022c5db0d4
+EBUILD nspr-4.7.1.ebuild 2324 RMD160 c99fbc30dc3440d1a6ce8d9157214286a7eb5e7b SHA1 6a53662e98dad5f3f6d0a774c1d1a1a90cada43c SHA256 30d148d6d39c058b5c0d1d1bd410b443f2c74bfe8083562b09b5fdf64ee28bc1
+MISC ChangeLog 13712 RMD160 67a4a588b0d21490f58cceeed7b79bd43c60d38b SHA1 964f0e1e5185854b2b7b7d00689442dbe072944c SHA256 6712b19e50e6b78a620825b651983f2261650c4b6f3e11f7c3b715f3aeaef734
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/dev-libs/nspr/nspr-4.7.1.ebuild b/dev-libs/nspr/nspr-4.7.1.ebuild
index 632972d73334..681481db3fbe 100644
--- a/dev-libs/nspr/nspr-4.7.1.ebuild
+++ b/dev-libs/nspr/nspr-4.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.1.ebuild,v 1.1 2008/05/11 14:29:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.1.ebuild,v 1.2 2008/08/13 16:57:20 armin76 Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -23,6 +23,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
 	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
 	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+		mozilla/nsprpub/config/rules.mk
 }
 
 src_compile() {
diff --git a/dev-libs/nspr/nspr-4.7.1_beta2.ebuild b/dev-libs/nspr/nspr-4.7.1_beta2.ebuild
deleted file mode 100644
index 60820376904b..000000000000
--- a/dev-libs/nspr/nspr-4.7.1_beta2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.1_beta2.ebuild,v 1.3 2008/04/30 13:47:55 armin76 Exp $
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Netscape Portable Runtime"
-HOMEPAGE="http://www.mozilla.org/projects/nspr/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 debug"
-
-DEPEND=">=dev-db/sqlite-3.5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	    *64-bit*) myconf="${myconf} --enable-64bit";;
-	    *32-bit*) ;;
-	    *) die "FAIL";;
-	esac
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \
-		--enable-system-sqlite"
-
-	ECONF_SOURCE="../mozilla/nsprpub" econf \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=7
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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
-	dobin "${S}"/build/config/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "${S}"/build/config/nspr.pc
-
-	# Remove stupid files in /usr/bin
-	rm "${D}"/usr/bin/{prerr.properties,nspr.pc}
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
-}
diff --git a/dev-libs/nspr/nspr-4.7.ebuild b/dev-libs/nspr/nspr-4.7.ebuild
deleted file mode 100644
index eb090ffcd863..000000000000
--- a/dev-libs/nspr/nspr-4.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.ebuild,v 1.5 2008/04/30 13:47:55 armin76 Exp $
-
-inherit eutils multilib toolchain-funcs
-
-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 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 debug"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mkdir build inst
-	epatch "${FILESDIR}"/${PN}-4.6.1-config.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch
-	epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch
-	epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
-}
-
-src_compile() {
-	cd "${S}"/build
-
-	echo > "${T}"/test.c
-	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
-	case $(file "${T}"/test.o) in
-	    *64-bit*) myconf="${myconf} --enable-64bit";;
-	    *32-bit*) ;;
-	    *) die "FAIL";;
-	esac
-
-	if use ipv6; then
-		myconf="${myconf} --enable-ipv6"
-	fi
-
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr"
-
-	ECONF_SOURCE="../mozilla/nsprpub" econf \
-		$(use_enable debug) \
-		${myconf} || die "econf failed"
-	make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
-}
-
-src_install () {
-	# Their build system is royally fucked, as usual
-	MINOR_VERSION=7
-	cd "${S}"/build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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
-	dobin "${S}"/build/config/nspr-config
-
-	# create pkg-config file
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins "${S}"/build/config/nspr.pc
-
-	# Remove stupid files in /usr/bin
-	rm "${D}"/usr/bin/{prerr.properties,nspr.pc}
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
-}