From d372b386ae35547c403a753fc9b6f0f51e9a70cf Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Thu, 25 Aug 2011 13:35:14 +0200 Subject: Fix nspr for minor-version removal Signed-off-by: Marc-Antoine Perennou --- dev-libs/nspr/Manifest | 2 +- dev-libs/nspr/nspr-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index f87ed7f..e364722 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -2,4 +2,4 @@ AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036 AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2 AUX pkgconfig.patch 4026 RMD160 147bcc36fe2394a0c5c7cdc531c88cc18eada7c9 SHA1 ae34f19de86ab5fefd3e443864120db3c77bc7dc SHA256 2ea7b2584ee440b8bbd7ad89c7f71b8e1a5b97737e1e9e23c6b0f1055777a033 -EBUILD nspr-9999.ebuild 1880 RMD160 e76b2187e5a8822a854959602c42eadc246f039a SHA1 75c582766dae40399ae7bd72ec891be8f9858c77 SHA256 e24b18eab044142e0ca6f9a7af6e022f8a8d577a269c41f6844c7ab9f98127d5 +EBUILD nspr-9999.ebuild 1882 RMD160 4c471a603d6123d81ff729f8b94ff8a90851bcaa SHA1 b3b7b8d3febf386fe6d936594881f461c7838973 SHA256 5823acf46c8636118cb5394290db270831691598e66b3ee952fd3fd0eafced96 diff --git a/dev-libs/nspr/nspr-9999.ebuild b/dev-libs/nspr/nspr-9999.ebuild index d7ce940..7c395ee 100644 --- a/dev-libs/nspr/nspr-9999.ebuild +++ b/dev-libs/nspr/nspr-9999.ebuild @@ -53,7 +53,7 @@ src_install () { fi local n= - MINOR_VERSION=$(sed -n -r -e 's|.*NSPR_[0-9]+_([0-9]+)_[0-9]+.*|\1|p' "${S}"/nsprpub/TAG-INFO) + MINOR_VERSION=$(sed -n -r -e 's|.*NSPR_[0-9]+_([0-9]+)(_[0-9]+)?.*|\1|p' "${S}"/nsprpub/TAG-INFO) for file in *$(get_libname); do n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) mv ${file} ${n} || die "failed to mv files around" -- cgit v1.2.3-65-gdbad From d765ac9876e1d39d51cc86f0a95515b225bab62d Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Mon, 5 Sep 2011 10:18:13 +0200 Subject: Fix nspr patch Signed-off-by: Marc-Antoine Perennou --- dev-libs/nspr/Manifest | 2 +- dev-libs/nspr/files/pkgconfig.patch | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index e364722..741791c 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,5 +1,5 @@ AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036e4b96a3f88b57818d01721ed4f6adca98 SHA256 d8589298735028e9899e767da382523d83331f2c358440beaccf34ca569567be AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2 -AUX pkgconfig.patch 4026 RMD160 147bcc36fe2394a0c5c7cdc531c88cc18eada7c9 SHA1 ae34f19de86ab5fefd3e443864120db3c77bc7dc SHA256 2ea7b2584ee440b8bbd7ad89c7f71b8e1a5b97737e1e9e23c6b0f1055777a033 +AUX pkgconfig.patch 4113 RMD160 2deb87046f9423dfb1c53a533eb0f85c74a76ce2 SHA1 4c8beec33a8c7c024c1853d2f5b4c2d3b381881d SHA256 eacdadd6f6cc8972f42849e1092251139f28609e766868b8bc07220fc8c01811 EBUILD nspr-9999.ebuild 1882 RMD160 4c471a603d6123d81ff729f8b94ff8a90851bcaa SHA1 b3b7b8d3febf386fe6d936594881f461c7838973 SHA256 5823acf46c8636118cb5394290db270831691598e66b3ee952fd3fd0eafced96 diff --git a/dev-libs/nspr/files/pkgconfig.patch b/dev-libs/nspr/files/pkgconfig.patch index b13e113..f2e512e 100644 --- a/dev-libs/nspr/files/pkgconfig.patch +++ b/dev-libs/nspr/files/pkgconfig.patch @@ -16,11 +16,14 @@ diff -r 40ebe6af8a66 nsprpub/config/Makefile.in diff -r 40ebe6af8a66 nsprpub/config/config.mk --- a/nsprpub/config/config.mk Sat Apr 16 17:57:51 2011 +0200 +++ b/nsprpub/config/config.mk Sat Apr 16 19:03:01 2011 +0200 -@@ -173,3 +173,4 @@ +@@ -175,6 +175,7 @@ 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 + + # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including + # this file diff -r 40ebe6af8a66 nsprpub/config/nspr-config.in --- a/nsprpub/config/nspr-config.in Sat Apr 16 17:57:51 2011 +0200 +++ b/nsprpub/config/nspr-config.in Sat Apr 16 19:03:01 2011 +0200 -- cgit v1.2.3-65-gdbad From 2328ad2ee772e8214b0b860fa1426a7c09affcfa Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Sun, 25 Sep 2011 09:36:12 +0200 Subject: mozilla-app.eclass: Fix python version use --- eclass/mozilla-app.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/mozilla-app.eclass b/eclass/mozilla-app.eclass index 7958e5c..8ece7c1 100644 --- a/eclass/mozilla-app.eclass +++ b/eclass/mozilla-app.eclass @@ -75,6 +75,7 @@ IUSE="+alsa bindist custom-optimization debug dbus gconf +ipc libnotify mozdom r EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst function mozilla-app_pkg_setup() { + mozilla-scm_pkg_setup # Set by configure (plus USE_AUTOCONF=1), but useful for NSPR export MOZILLA_CLIENT=1 export BUILD_OPT=1 -- cgit v1.2.3-65-gdbad