From: Jory Pratt Date: Sat, 10 Apr 2010 04:06:22 +0000 (+0000) Subject: remove stable ebuilds/files X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a2bda629ca5abe0e57002e761d73c22f634b3fa;p=gentoo.git remove stable ebuilds/files Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 6b514c098151..8017ee268d3b 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/nspr # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.137 2010/03/09 01:55:51 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.138 2010/04/10 04:06:21 anarchy Exp $ + + 10 Apr 2010; -files/nspr-4.6.1-gcc-visibility.patch, + -files/nspr-4.6.1-prtime.patch, -nspr-4.6.8.ebuild, -nspr-4.7.3.ebuild, + -nspr-4.7.4.ebuild, -nspr-4.8.2.ebuild, -nspr-4.8.2-r1.ebuild, + -nspr-4.8.3-r3.ebuild, -files/nspr-4.8-pkgconfig-gentoo.patch, + -files/nspr-4.8-pkgconfig-gentoo-1.patch, -files/nspr.pc.in: + remove stable ebuilds/files *nspr-4.8.4 (09 Mar 2010) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index ab760b868cef..69a9df00f3f7 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,28 +1,12 @@ 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 AUX nspr-4.6.1-lang.patch 1718 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 SHA1 a5ae7b8c95204279fbcb1ac46a242448aa5a894d SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb -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-2.patch 4711 RMD160 3709911449facde45d1bebc60e9e1593aa691af5 SHA1 c41c608247aa712f783a1ec8ea2943b79dee44eb SHA256 5cd96bcb47f9678d4aac95d91d975101d31f038b05bd3f5b191a262d733b8943 -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 -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 -DIST nspr-4.8.2.tar.gz 1232677 RMD160 e7447144f3c57a3d195c94ee9465646b360dc60f SHA1 14af8f12a0975630a13f5aa3c890e92960a0be93 SHA256 23ec182a42eec4b6df01f3c02c632ed9f7e004d6c320d048d5fe24054d319bce -DIST nspr-4.8.3.tar.gz 1198558 RMD160 ba51a392e5807feeba2b0111c73725b391fb9e93 SHA1 f3647530cb3a23b170c6a3a192484b1a054c273c SHA256 b7ff8783da0a96c2bcb60b0882e3e585be43ecb3dd529d8ac30aa38ea4f4fbd8 DIST nspr-4.8.4.tar.gz 1196103 RMD160 654b86f773130f74a19df3a06e40917a4cef9eb7 SHA1 c4af8c2956674ff0f17b4247516716e92db40cf6 SHA256 8c119a1702acf7568e5de887e84b34470a929639ee5a89271df2ba57a31f6746 DIST nspr-4.8.tar.gz 1170419 RMD160 f63468de3613793a8b564e967f3a963aab977c99 SHA1 ac30ec18bf0d070a9663d1a8c2d258004f3f42ad SHA256 a2de84aa21a7bbabd93c4f172123d58c6432c2358807bb260ac338b2dc61dbfe -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.3-r3.ebuild 2762 RMD160 b6ac8e029645a4e96a1a0a6cef8c78263252b6ad SHA1 acd82b62bdbf6ce75c540a808f2c8ad65cfbc891 SHA256 db9e6f71beb9a43f1f6516dd2678316ddf77b413f1edd5c8a779fd39f758a14d EBUILD nspr-4.8.4.ebuild 2731 RMD160 71acdbc5ddf77e0d04d3c69f6a628e682c252645 SHA1 30a883e9481c9050cded854a61192cc37030ec43 SHA256 acb07ffdf7fe41c993b2afd541cb1507e659a5535d97d18435d826e2598f4d00 EBUILD nspr-4.8.ebuild 2547 RMD160 a712f9f925c0bd045904a56d8b3a7ce09c44b9bb SHA1 26005a81d7cfd5ff5d571431da4452cff7cde536 SHA256 c49138f629d41b2958583b212a137908c5508228be87756217057c5c2e036e8d -MISC ChangeLog 17655 RMD160 d1554573a39ff3af23a9e498dd728fd3d128e070 SHA1 e1545eccffc2b7d75b617b287520907c30bb46f1 SHA256 2e0241d47679c2b93fa2a8d1d3b167476c7cf7d6986fcb91dc65a468cbbec32f +MISC ChangeLog 18029 RMD160 13cf7aa4ac49db306436496aca4378aa3044a159 SHA1 e31d9aa9ca3505cfd34bd546977c873268f87568 SHA256 b56921721f9b588e4b63be7d5f6cc4184dadfc65cf0d28e174a13c9346003de1 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b diff --git a/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch b/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch deleted file mode 100644 index a741c3b3bbbb..000000000000 --- a/dev-libs/nspr/files/nspr-4.6.1-gcc-visibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: mozilla/nsprpub/pr/include/prtypes.h -diff -u mozilla/nsprpub/pr/include/prtypes.h:3.30 mozilla/nsprpub/pr/include/prtypes.h:3.30.2.1 ---- mozilla/nsprpub/pr/include/prtypes.h:3.30 Fri Apr 29 21:02:54 2005 -+++ mozilla/nsprpub/pr/include/prtypes.h Tue Jan 3 17:43:35 2006 -@@ -178,7 +178,9 @@ - - #else /* Unix */ - --#ifdef HAVE_VISIBILITY_PRAGMA -+/* GCC 3.3 and later support the visibility attribute. */ -+#if (__GNUC__ >= 4) || \ -+ (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) - #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default"))) - #else - #define PR_VISIBILITY_DEFAULT diff --git a/dev-libs/nspr/files/nspr-4.6.1-prtime.patch b/dev-libs/nspr/files/nspr-4.6.1-prtime.patch deleted file mode 100644 index 4839838f2b06..000000000000 --- a/dev-libs/nspr/files/nspr-4.6.1-prtime.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mozilla/nsprpub/pr/src/misc/prtime.c-orig 2004-04-25 10:01:01.000000000 -0500 -+++ mozilla/nsprpub/pr/src/misc/prtime.c 2006-02-23 12:07:35.098166000 -0600 -@@ -1509,7 +1509,7 @@ - case TT_EET: zone_offset = 2 * 60; break; - case TT_JST: zone_offset = 9 * 60; break; - default: -- PR_ASSERT (0); -+ return PR_FAILURE; - break; - } - } -@@ -1551,11 +1551,12 @@ - struct tm localTime; - time_t secs; - -- PR_ASSERT(tm.tm_month > -1 -+ if (!(tm.tm_month > -1 - && tm.tm_mday > 0 - && tm.tm_hour > -1 - && tm.tm_min > -1 -- && tm.tm_sec > -1); -+ && tm.tm_sec > -1)) -+ return PR_FAILURE; - - /* - * To obtain time_t from a tm structure representing the local 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 deleted file mode 100644 index 95961e64fcdb..000000000000 --- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-1.patch +++ /dev/null @@ -1,126 +0,0 @@ -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/files/nspr-4.8-pkgconfig-gentoo.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch deleted file mode 100644 index 3309ae085feb..000000000000 --- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo.patch +++ /dev/null @@ -1,126 +0,0 @@ -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: -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/files/nspr.pc.in b/dev-libs/nspr/files/nspr.pc.in deleted file mode 100644 index 266079015c4e..000000000000 --- a/dev-libs/nspr/files/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib/nspr -includedir=/usr/include - -Name: NSPR -Description: The Netscape Portable Runtime -Version: @NSPR_VER@ -Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl -Wl,-R${libdir} -Cflags: -I${includedir}/nspr diff --git a/dev-libs/nspr/nspr-4.6.8.ebuild b/dev-libs/nspr/nspr-4.6.8.ebuild deleted file mode 100644 index ca4294519d34..000000000000 --- 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.13 2009/08/02 19:23:31 darkside 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 confusing, 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 index 309cf42679d7..000000000000 --- 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.10 2009/08/02 19:23:31 darkside 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 confusing, 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.7.4.ebuild deleted file mode 100644 index b93c10329cbf..000000000000 --- a/dev-libs/nspr/nspr-4.7.4.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.4.ebuild,v 1.8 2009/08/02 19:23:31 darkside 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 confusing, 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.8.2-r1.ebuild b/dev-libs/nspr/nspr-4.8.2-r1.ebuild deleted file mode 100644 index 6567363038c2..000000000000 --- a/dev-libs/nspr/nspr-4.8.2-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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/nspr/nspr-4.8.2.ebuild b/dev-libs/nspr/nspr-4.8.2.ebuild deleted file mode 100644 index ad67bd2af973..000000000000 --- a/dev-libs/nspr/nspr-4.8.2.ebuild +++ /dev/null @@ -1,88 +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.8.2.ebuild,v 1.1 2009/11/30 15:07:32 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.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/nspr/nspr-4.8.3-r3.ebuild b/dev-libs/nspr/nspr-4.8.3-r3.ebuild deleted file mode 100644 index 76aba563fd7a..000000000000 --- a/dev-libs/nspr/nspr-4.8.3-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# 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.3-r3.ebuild,v 1.1 2010/02/22 00:59:01 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="debug ipv6" - -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)" - - ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - $(use_enable ipv6) \ - ${myconf} || die "econf failed" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" -} - -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) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove staic libraries." - done - - for file in *.so; do - mv ${file} ${file}.${MINOR_VERSION} || die "failed to mv files around" - ln -s ${file}.${MINOR_VERSION} ${file} || die "failed to symlink files." - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # create pkg-config file - insinto /usr/$(get_libdir)/pkgconfig/ - doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" - - # Remove stupid files in /usr/bin - rm -f "${D}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} - -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 -}