diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.122 2009/05/01 14:03:12 maekke Exp $ + 12 Jun 2009; Nathan Phillip Brink (ohnobinki) + -nspr-4.6.8.ebuild, -nspr-4.7.3.ebuild, + -nspr-4.7.4.ebuild, +nspr-4.8.ebuild: + Imported, bumped to 4.8 + 01 May 2009; Markus Meier nspr-4.7.4.ebuild: amd64 stable, bug #267234 diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 AUX nspr-4.6.1-config.patch 2722 RMD160 75701d5dbdd25a05a3bb43539bfa5f5ea850aabd SHA1 e8deaea05baf51eb6795db4e89ab89162d5d4632 SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842 AUX nspr-4.6.1-gcc-visibility.patch 594 RMD160 90d12fb89d8c23880d6a9c2018cddb100e1c0fb9 SHA1 f3a247214c67f0b019885d75fa8d572c508b6dee SHA256 1a8f18ecff6d28b0ce92a3d59e4eb844d79e9d25eed401e6dc66c33b03f59613 @@ -8,18 +5,7 @@ AUX nspr-4.6.1-lang.patch 1718 RMD160 6c AUX nspr-4.6.1-prtime.patch 1003 RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b SHA1 090ca70eec5bd202686b718e3a6a247f1f58556a SHA256 54ed12024f4fd65bb911279faab18665b00429c7d0811c7485d4ff5c2c436237 AUX nspr-4.7.0-prtime.patch 964 RMD160 a963c21fb1ce5e8913d3c41753ca37b24e80798d SHA1 b47ffa12022ea83b738e5d847e61cca026ec7f07 SHA256 3fd4f3c68257dced021c0bfa00245d0da2d6c64205135b1cc89f96a3375dffc7 AUX nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 SHA1 edcc81bcdb0618418aaa0d3fb82a3d0475b9098a SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 -DIST nspr-4.6.8.tar.gz 1313108 RMD160 da8b77c3b386adb82467613e0bcdbdf5f68369ea SHA1 ca0d7a940e1cf6cf6bd63680fedf090195d0b460 SHA256 47750e6a99e2570fa2119f21d5d201174282679352379a565e3e5a80453e48b1 -DIST nspr-4.7.3.tar.gz 1254585 RMD160 532417c8c4d04a32d6cfc09ea8f2279d5ee69e72 SHA1 351c34c8f26d11a441bc3130655cd9144e724899 SHA256 b1d2419ef1807c38944fc746fff14fda8506589e5462dc31194a9d1b494b9f49 -DIST nspr-4.7.4.tar.gz 1256846 RMD160 7f6478f889dbddd91271d2182ace910f32a2c375 SHA1 7653b922b1953bb21d25fb445d0ead90ac79dd21 SHA256 5532056aff17d6769953727ac7ba8dc62741612e936c5be84496671f8a2d08cd -EBUILD nspr-4.6.8.ebuild 2830 RMD160 897efd655cf6de5a05ce06fa05d0cb3a12a8ff27 SHA1 2b39e728b553eafb85906650d279d48106c3598d SHA256 6a8d95657fd74acaf938de75beb81e2af9874ee4e630d94e2e1fc232d5804766 -EBUILD nspr-4.7.3.ebuild 2463 RMD160 f3b2a42a6dd854388fb23b726195f4ae01abe22d SHA1 7afd5ffbad55c575280437c8cd3a72a427d22d81 SHA256 55fbd71933d0cb89d47cc367675ec64cba8bd9e1140c5bdcd45c8dbb65376bc3 -EBUILD nspr-4.7.4.ebuild 2464 RMD160 589d218dfbdc141cbcbf378400aa44e87be432be SHA1 6801db5f5a3db3012fb3b23eaf220874ef9773f1 SHA256 1853a8803e0511dd92926d830ca1e556a291b7f98bf82d3fe7e2360f6da5d5de +DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA1 ac30ec18bf0d070a9663d1a8c2d258004f3f42ad SHA256 a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe +EBUILD nspr-4.8.ebuild 2464 RMD160 589d218dfbdc141cbcbf378400aa44e87be432be SHA1 6801db5f5a3db3012fb3b23eaf220874ef9773f1 SHA256 1853a8803e0511dd92926d830ca1e556a291b7f98bf82d3fe7e2360f6da5d5de MISC ChangeLog 15647 RMD160 fad4beac5ba2b76f2b751c33bc28caab56ed9574 SHA1 7e89cbb789df7d4c66e95a7bce69a2baa1157c95 SHA256 c65bd4375313e26f8c0ec6bb0391dfb831d43c76037a130d2ffc125542abd598 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkn7ATYACgkQkKaRLQcq0GJr7QCfZ6P615ji7kpLrm+kkvExqvZG -l9MAoLWUiBsYSwHJDHhikD1S5SLZSgqc -=4WSp ------END PGP SIGNATURE----- diff --git a/dev-libs/nspr/nspr-4.6.8.ebuild b/dev-libs/nspr/nspr-4.6.8.ebuild deleted file mode 100644 --- a/dev-libs/nspr/nspr-4.6.8.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.8.ebuild,v 1.12 2009/04/29 20:56:27 fauli 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="" -RDEPEND="${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.6.1-prtime.patch -} - -src_compile() { - cd 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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - 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=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" -} diff --git a/dev-libs/nspr/nspr-4.7.3.ebuild b/dev-libs/nspr/nspr-4.7.3.ebuild deleted file mode 100644 --- a/dev-libs/nspr/nspr-4.7.3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.3.ebuild,v 1.9 2009/04/29 20:56:27 fauli 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=">=dev-db/sqlite-3.5" -RDEPEND="${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 - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - mozilla/nsprpub/config/rules.mk -} - -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 "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - 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.4.ebuild b/dev-libs/nspr/nspr-4.8.ebuild rename from dev-libs/nspr/nspr-4.7.4.ebuild rename to dev-libs/nspr/nspr-4.8.ebuild