diff options
| -rw-r--r-- | dev-libs/nspr/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/nspr/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-1.patch | 126 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.8.2-r1.ebuild | 88 | ||||
| -rw-r--r-- | dev-libs/nss/Manifest | 4 |
5 files changed, 227 insertions, 5 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 2e053643f7b5..b36c30a06620 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/nspr -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.131 2009/11/30 15:07:32 anarchy Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.132 2010/01/27 02:08:23 anarchy Exp $ + +*nspr-4.8.2-r1 (27 Jan 2010) + + 27 Jan 2010; <anarchy@gentoo.org> + +files/nspr-4.8-pkgconfig-gentoo-1.patch, +nspr-4.8.2-r1.ebuild: + Ensure dynamic linking stays consistent for all *nspr-4.8.2 (30 Nov 2009) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 23c9fcd140c8..6b097c36dae1 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -5,6 +5,7 @@ AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 S 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-4.8-config.patch 1429 RMD160 1988289c042f97ad8c3681b7febbbea45a3de9a6 SHA1 0055fb2f27865e3bcc6d6a9e6f79b633443295d6 SHA256 7cb63ea677ad9c92dde4513b16258f092b463738cb145edd95dd671bcfaa2150 +AUX nspr-4.8-pkgconfig-gentoo-1.patch 4723 RMD160 5dd7066a06a1a0f1c239c6722acc5b00cbc3963b SHA1 ac646c5caa3c087bb43a766184b4d99933d81d47 SHA256 a6b8ca941d5b8e9991aee9cf9b45a0d982e2919b369b0c342fffebefff4211d2 AUX nspr-4.8-pkgconfig-gentoo.patch 4711 RMD160 3709911449facde45d1bebc60e9e1593aa691af5 SHA1 c41c608247aa712f783a1ec8ea2943b79dee44eb SHA256 5cd96bcb47f9678d4aac95d91d975101d31f038b05bd3f5b191a262d733b8943 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 @@ -15,7 +16,8 @@ DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA EBUILD nspr-4.6.8.ebuild 2836 RMD160 755ac5dc4f3046606421712ec2a5398fff47a507 SHA1 db7685ed1a0771e44b63890ec9fa22b8657dc4a2 SHA256 2b5f37ac78466b893453219a56f46cc5b386e42c9ce20ad367edc216dd2cf486 EBUILD nspr-4.7.3.ebuild 2470 RMD160 3b1b38af3f205dab83d1fdd6112f1f2bb11f7298 SHA1 bd90c84800679fe9ca9fed902f6be229d7851ce6 SHA256 416f4f8d7cf59c6edcb4e182ffaffb2168b5785fed28405b7a2178c95f41f607 EBUILD nspr-4.7.4.ebuild 2469 RMD160 0f9cbd74d5aadf99d323011b6bbf3a7f0a3910ca SHA1 3613ececadf279496d3adb07d9376ebd79156c63 SHA256 d7289a6330e65ca4ef77d4e4ca93ba6b277484be483e2cbf3aa6163e1dfa0bcc +EBUILD nspr-4.8.2-r1.ebuild 2607 RMD160 ec977cfce2c8bedd528ecdf08ea799773cd5209a SHA1 a1bc50dde433dd7cca362a37e1d94b7124c6ea8d SHA256 a744309fbc7c6467c0c4f1206518d6a1dfe97d8a31ecf1c7edb8cd8ba5a7bd23 EBUILD nspr-4.8.2.ebuild 2602 RMD160 e0ed0f3ed8a1dc9b4842c6d36891ae73aa53110c SHA1 dd7cc63640d5c76bb92fc3657c90ee8882bd0ae9 SHA256 eea6ab1134f6cca3ad9f94b806ee40fef11b370924f2474c68c62c1eb98cb9a3 EBUILD nspr-4.8.ebuild 2547 RMD160 a712f9f925c0bd045904a56d8b3a7ce09c44b9bb SHA1 26005a81d7cfd5ff5d571431da4452cff7cde536 SHA256 c49138f629d41b2958583b212a137908c5508228be87756217057c5c2e036e8d -MISC ChangeLog 16723 RMD160 d7d23b8255a8cf3c91f0390332aff580c5635f87 SHA1 b779d50e944dbe07a9960cee28419fa2006e24a0 SHA256 929a6277388e9a599b099e7bf573ce2d19301ad8b393d8671e86aa051915b5cb +MISC ChangeLog 16907 RMD160 aecdd5f17a0a84e70da810a0e50250cd3a227ad5 SHA1 dd018e2ee8d8d2e18b92cc15dbdec63cd2b1d1b8 SHA256 724853296fe6b7185ff33305963728d8cbc11193d3c38fdf6b0a795dc392ff48 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-1.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-1.patch new file mode 100644 index 000000000000..95961e64fcdb --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-1.patch @@ -0,0 +1,126 @@ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 +@@ -162,3 +162,4 @@ + RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include + RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin + RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib ++RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in +--- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 +@@ -52,9 +52,10 @@ + + # autoconf.mk must be deleted last (from the top-level directory) + # because it is included by every makefile. +-DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config ++DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc + + RELEASE_BINS = nspr-config ++RELEASE_PC = nspr.pc + + include $(topsrcdir)/config/config.mk + +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 +@@ -92,13 +92,13 @@ + + # Set variables that may be dependent upon other variables + if test -z "$exec_prefix"; then +- exec_prefix=@exec_prefix@ ++ exec_prefix=`pkg-config --variable=exec_prefix nspr` + fi + if test -z "$includedir"; then +- includedir=@includedir@ ++ includedir=`pkg-config --variable=includedir nspr` + fi + if test -z "$libdir"; then +- libdir=@libdir@ ++ libdir=`pkg-config --variable=libdir nspr` + fi + + if test "$echo_prefix" = "yes"; then +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in +--- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 ++++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: NSPR ++Description: The Netscape Portable Runtime ++Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ ++Libs: -R${libdir} -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread ++Cflags: -I${includedir} ++ +diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk +--- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 ++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 +@@ -211,7 +211,7 @@ + rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) + +$(LOOP_OVER_DIRS) + +-install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) ++install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) + ifdef RELEASE_BINS + $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) + endif +@@ -221,6 +221,9 @@ + ifdef RELEASE_LIBS + $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) + endif ++ifdef RELEASE_PC ++ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ ++endif + +$(LOOP_OVER_DIRS) + + release:: export +@@ -272,6 +275,23 @@ + fi + cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) + endif ++ifdef RELEASE_PC ++ @echo "Copying pkg-config files to release directory" ++ @if test -z "$(BUILD_NUMBER)"; then \ ++ echo "BUILD_NUMBER must be defined"; \ ++ false; \ ++ else \ ++ true; \ ++ fi ++ @if test ! -d $(RELEASE_PC_DEST); then \ ++ rm -rf $(RELEASE_PC_DEST); \ ++ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ ++ else \ ++ true; \ ++ fi ++ cp $(RELEASE_PC) $(RELEASE_PC_DEST) ++endif ++ + +$(LOOP_OVER_DIRS) + + alltags: +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure +--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 +@@ -6037,6 +6037,7 @@ + config/nsprincl.mk + config/nsprincl.sh + config/nspr-config ++config/nspr.pc + lib/Makefile + lib/ds/Makefile + lib/libc/Makefile +diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in +--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 ++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 +@@ -2871,6 +2871,7 @@ + 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.8.2-r1.ebuild b/dev-libs/nspr/nspr-4.8.2-r1.ebuild new file mode 100644 index 000000000000..6567363038c2 --- /dev/null +++ b/dev-libs/nspr/nspr-4.8.2-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.2-r1.ebuild,v 1.1 2010/01/27 02:08:23 anarchy Exp $ + +inherit eutils multilib toolchain-funcs versionator + +MIN_PV="$(get_version_component_range 2)" + +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.8-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 + epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-1.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 + + myconf="${myconf} --libdir=/usr/$(get_libdir)/nspr \ + --enable-system-sqlite --with-mozilla --with-pthreads" + + ECONF_SOURCE="../mozilla/nsprpub" econf \ + $(use_enable ipv6) \ + $(use_enable debug) \ + ${myconf} || die "econf failed" + make CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die +} + +src_install () { + # Their build system is royally confusing, as usual + MINOR_VERSION=${MIN_PV} # Used for .so version + 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 +} + +pkg_postinst() { + ewarn + ewarn "Please make sure you run revdep-rebuild after upgrade." + ewarn "This is *extremely* important to ensure your system nspr works properly." + ewarn +} diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index ccb1369a0858..842f8dcf21bd 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -23,6 +23,6 @@ EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SH EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927 EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SHA1 88c7c9f9c821d9df2ae8ab0497adfa6f3c4b9195 SHA256 7e1430b5c050da8b83aad62209a5fc0a7262676f8adf38f00d8a92123cedb9ce EBUILD nss-3.12.4-r2.ebuild 3797 RMD160 f9cc7d27298f953b5d70551c199432e48d933e5d SHA1 418b773d837571db4918cbbba8b5f43216b8db3f SHA256 cddf7ceebbd2077a5e1245d23db28a92c8ff3e7cb17eb0e3f148e0ad03e2df12 -EBUILD nss-3.12.5.ebuild 4110 RMD160 473dbd67b8c47f0fcf8d29b7b35bd97621c68192 SHA1 9f37bb556686b66cd479b4e58ae59e6ce3226608 SHA256 27f048501cfcbf33e04605b3bc8dad9ab2fe9a3c61ccce50af07a5a54ef26829 -MISC ChangeLog 20697 RMD160 1361b2f28861e5f390f1ea0ac418ba532ec28b23 SHA1 0d7c6be6f9c9b8d5cba25155ccc8d1e7d63e195f SHA256 f1fdd016a4a940ae4cbb546b7c073f0c32add6d09a9cee01f5fad4e60e40c48e +EBUILD nss-3.12.5.ebuild 3910 RMD160 345eea218a2ff1ec2d37d716651184f45d617d27 SHA1 7cce495fdc19b6d31cefe3fa2db3cf944133a5ab SHA256 e79e61bb097733abd4c0cc3613e1fca23fcc0a60f20f98c14c48db1b044b83ca +MISC ChangeLog 20803 RMD160 c429a2f1de6ccbcc77a86ce29e55ad9da6dd861f SHA1 4c1060f6aa35c5c355632fd3a0cb39b650bdaa5b SHA256 92ffd28c5a73d8e5227cad61fab2c4ca9bc91d215e22adeabf0cb5860aee2694 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4 |