public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/nss: ChangeLog nss-3.12.4.ebuild
@ 2009-09-15  3:22 Jory Pratt (anarchy)
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt (anarchy) @ 2009-09-15  3:22 UTC (permalink / raw
  To: gentoo-commits

anarchy     09/09/15 03:22:23

  Modified:             ChangeLog
  Added:                nss-3.12.4.ebuild
  Log:
  update to nss-3.12.4 require pkgconfig in rdepend for nss-config --libdir,--includedir calls
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.153                dev-libs/nss/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog	5 Sep 2009 20:39:37 -0000	1.152
+++ ChangeLog	15 Sep 2009 03:22:22 -0000	1.153
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.152 2009/09/05 20:39:37 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.153 2009/09/15 03:22:22 anarchy Exp $
+
+*nss-3.12.4 (15 Sep 2009)
+
+  15 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> +nss-3.12.4.ebuild,
+  +files/nss-3.12.4-gentoo-fixups-1.diff:
+  add nss-3.12.4 revision bump, many many bug fixes
 
   05 Sep 2009; Tobias Heinlein <keytoaster@gentoo.org> nss-3.12.3-r1.ebuild:
   amd64 stable wrt bug #280839



1.1                  dev-libs/nss/nss-3.12.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.1&content-type=text/plain

Index: nss-3.12.4.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v 1.1 2009/09/15 03:22:22 anarchy Exp $

inherit eutils flag-o-matic multilib toolchain-funcs

NSPR_VER="4.7.4"
RTM_NAME="NSS_${PV//./_}_RTM"
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
#	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="utils"

DEPEND=">=dev-libs/nspr-${NSPR_VER}
	>=dev-db/sqlite-3.5
	dev-util/pkgconfig"
RDEPEND="${DEPEND}"

src_unpack() {
	unpack ${A}

	# Custom changes for gentoo
	epatch "${FILESDIR}"/"${P}"-gentoo-fixups-1.diff

	cd "${S}"/mozilla/security/coreconf

	# modify install path
	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
		-i source.mk

	# Respect LDFLAGS
	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk

	# Ensure we stay multilib aware
	sed -i -e "s:gentoo:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile
}

src_compile() {
	strip-flags

	echo > "${T}"/test.c
	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
	case $(file "${T}"/test.o) in
	*64-bit*) export USE_64=1;;
	*32-bit*) ;;
	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
	esac

	export BUILD_OPT=1
	export NSS_USE_SYSTEM_SQLITE=1
	export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
	export NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
	export USE_SYSTEM_ZLIB=1
	export ZLIB_LIBS=-lz
	export NSDISTMODE=copy
	export NSS_ENABLE_ECC=1
	export XCFLAGS="${CFLAGS}"
	export FREEBL_NO_DEPEND=1

	cd "${S}"/mozilla/security/coreconf
	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
	cd "${S}"/mozilla/security/dbm
	emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
	cd "${S}"/mozilla/security/nss
	emake -j1 CC="$(tc-getCC)" || die "nss make failed"
}

src_install () {
	MINOR_VERSION=12
	cd "${S}"/mozilla/security/dist

	# put all *.a files in /usr/lib/nss (because some have conflicting names
	# with existing libraries)
	dodir /usr/$(get_libdir)/nss
	cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed"
	cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed"
	cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed"

	# Install nspr-config and pkgconfig file
	dodir /usr/bin
	cp -L */bin/nss-config "${D}"/usr/bin
	dodir /usr/$(get_libdir)/pkgconfig
	cp -L */lib/pkgconfig/nss.pc "${D}"/usr/$(get_libdir)/pkgconfig

	# all the include files
	insinto /usr/include/nss
	doins private/nss/*.h
	doins public/nss/*.h
	cd "${D}"/usr/$(get_libdir)/nss
	for file in *.so; do
		mv ${file} ${file}.${MINOR_VERSION}
		ln -s ${file}.${MINOR_VERSION} ${file}
	done

	# coping with nss being in a different path. We move up priority to
	# ensure that nss/nspr are used specifically before searching elsewhere.
	dodir /etc/env.d
	echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss

	if use utils; then
		cd "${S}"/mozilla/security/dist/*/bin/
		for f in *; do
			newbin ${f} nss${f}
		done
	fi
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/nss: ChangeLog nss-3.12.4.ebuild
@ 2009-09-15 17:38 Jory Pratt (anarchy)
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt (anarchy) @ 2009-09-15 17:38 UTC (permalink / raw
  To: gentoo-commits

anarchy     09/09/15 17:38:42

  Modified:             ChangeLog nss-3.12.4.ebuild
  Log:
  add warning for soname change breaking binaries.
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.154                dev-libs/nss/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	15 Sep 2009 03:22:22 -0000	1.153
+++ ChangeLog	15 Sep 2009 17:38:42 -0000	1.154
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.153 2009/09/15 03:22:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.154 2009/09/15 17:38:42 anarchy Exp $
+
+  15 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> nss-3.12.4.ebuild:
+  Add warning about binary breakage with soname change
 
 *nss-3.12.4 (15 Sep 2009)
 



1.2                  dev-libs/nss/nss-3.12.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?r1=1.1&r2=1.2

Index: nss-3.12.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nss-3.12.4.ebuild	15 Sep 2009 03:22:22 -0000	1.1
+++ nss-3.12.4.ebuild	15 Sep 2009 17:38:42 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v 1.1 2009/09/15 03:22:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v 1.2 2009/09/15 17:38:42 anarchy Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -17,10 +17,9 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="utils"
 
-DEPEND=">=dev-libs/nspr-${NSPR_VER}
-	>=dev-db/sqlite-3.5
-	dev-util/pkgconfig"
-RDEPEND="${DEPEND}"
+DEPEND="dev-util/pkgconfig"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5"
 
 src_unpack() {
 	unpack ${A}
@@ -55,7 +54,7 @@
 	export BUILD_OPT=1
 	export NSS_USE_SYSTEM_SQLITE=1
 	export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-	export NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
+	export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
 	export USE_SYSTEM_ZLIB=1
 	export ZLIB_LIBS=-lz
 	export NSDISTMODE=copy
@@ -110,3 +109,11 @@
 		done
 	fi
 }
+
+pkg_postinst() {
+	ewarn "We have moved backed to upstreams soname."
+	ewarn "If you find a binary that does not run please re-emerge"
+	ewarn "package to ensure it properly links."
+	elog
+}
+






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/nss: ChangeLog nss-3.12.4.ebuild
@ 2009-09-16 13:10 Jory Pratt (anarchy)
  0 siblings, 0 replies; 3+ messages in thread
From: Jory Pratt (anarchy) @ 2009-09-16 13:10 UTC (permalink / raw
  To: gentoo-commits

anarchy     09/09/16 13:10:06

  Modified:             ChangeLog nss-3.12.4.ebuild
  Log:
  make pkg_postinst() clearer for revdep-rebuild usage with libnss3.so.12
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.155                dev-libs/nss/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	15 Sep 2009 17:38:42 -0000	1.154
+++ ChangeLog	16 Sep 2009 13:10:06 -0000	1.155
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.154 2009/09/15 17:38:42 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.155 2009/09/16 13:10:06 anarchy Exp $
+
+  16 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> nss-3.12.4.ebuild:
+  Make pkg_postinst() clearer on revdep-rebuild usage.
 
   15 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> nss-3.12.4.ebuild:
   Add warning about binary breakage with soname change



1.5                  dev-libs/nss/nss-3.12.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild?r1=1.4&r2=1.5

Index: nss-3.12.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nss-3.12.4.ebuild	15 Sep 2009 20:14:56 -0000	1.4
+++ nss-3.12.4.ebuild	16 Sep 2009 13:10:06 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v 1.4 2009/09/15 20:14:56 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4.ebuild,v 1.5 2009/09/16 13:10:06 anarchy Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -111,8 +111,10 @@
 }
 
 pkg_postinst() {
-	ewarn "We have reverted back to using upstreams soname."
-	ewarn "If you find a binary that does not run please re-emerge"
-	ewarn "package to ensure it properly links."
+	elog "We have reverted back to using upstreams soname."
+	elog "Please run revdep-rebuild --library libnss3.so.12 , this"
+	elog "will correct most issues. If you find a binary that does"
+	elog "not run please re-emerge package to ensure it properly"
+	elog " links after upgrade."
 	elog
 }






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-09-16 13:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-15 17:38 [gentoo-commits] gentoo-x86 commit in dev-libs/nss: ChangeLog nss-3.12.4.ebuild Jory Pratt (anarchy)
  -- strict thread matches above, loose matches on Subject: below --
2009-09-16 13:10 Jory Pratt (anarchy)
2009-09-15  3:22 Jory Pratt (anarchy)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox