Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify ROOT variable in update-ca-certificates script. Signed off by maintainer with discussion

Package-Manager: portage-2.1.10.3/cvs/Linux i686

3 files changed, 22 insertions, 24 deletions

diff --git a/app-misc/ca-certificates/ChangeLog b/app-misc/ca-certificates/ChangeLog
index 38543210eeeb..65e6e6e6f667 100644
--- a/app-misc/ca-certificates/ChangeLog
+++ b/app-misc/ca-certificates/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/ca-certificates
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.47 2011/09/02 17:47:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ChangeLog,v 1.48 2011/09/02 19:08:32 darkside Exp $
+
+  02 Sep 2011; Jeremy Olexa <darkside@gentoo.org>
+  ca-certificates-20110502-r2.ebuild:
+  Add Gentoo Prefix support, convert to EAPI3, use prefix variables, modify
+  ROOT variable in update-ca-certificates script. Signed off by maintainer with
+  discussion
 
 *ca-certificates-20110502-r2 (02 Sep 2011)
 
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 84e244014efe..d54167b391af 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX ca-certificates-20090709-root.patch 2842 RMD160 cee480400c29c113b9478250997a0d08f18428aa SHA1 fc3305985dcc784387daccd2368a123546738312 SHA256 701da246597154c37b5c9ff6999730fe8b76fe10811f71b2d1eded50a2f4f175
 DIST ca-certificates_20090709_all.deb 154620 RMD160 d2e1b846341b2d7201675418b76f56f7decc929b SHA1 19790e219ee2c775f50d7ddd486ec60dfd0c7106 SHA256 de1e35997eb39c7ba5713f206aba034ff8ce8aa3aebebfc7eb1823de9968d767
 DIST ca-certificates_20110421_all.deb 176778 RMD160 504d592cc997c827da47699a3db5d4a25521a63a SHA1 863a3eabb7366e69942bfe10f6c2cd99c145d0b8 SHA256 a60a9c0faf1847df4553ce13ffe337412b88dd1b9d502741ac1760204c0bdda3
@@ -9,14 +6,7 @@ DIST ca-certificates_20110502_all.deb 175556 RMD160 22e74ea15def87024ee079191ad2
 EBUILD ca-certificates-20090709.ebuild 2126 RMD160 3d24608ff5c55225ed5c81a67857c0f8f78b81c2 SHA1 6ef2729547b0b7aea0308fc1a8017ff07602063b SHA256 86820ea4d33d9e0e779c0a0d631242b12821bf4135ec6bccd2c284e948c51b19
 EBUILD ca-certificates-20110421.ebuild 2119 RMD160 4d43af5a2d49eede27e6cd6b41568bfc45e655d9 SHA1 0c8c63fa35f9ab2f0bf8b867951647cba76e345f SHA256 1223e4710e2d72fbb97f93bfa77351912b20b6ea07e83c7672bd24b1d812a634
 EBUILD ca-certificates-20110502-r1.ebuild 2127 RMD160 268069f25fd98456375a0a850745fc96fe4fbd8a SHA1 68f7e3f70fa594d1aab7dba2981ffbb5874e34b2 SHA256 88d6fc0b8d0b58032f6346886238c02447a1487dfae0605dfb447d4e07f5549c
-EBUILD ca-certificates-20110502-r2.ebuild 2436 RMD160 12d19fb3bd0758437b5df365545cfe7c24f03186 SHA1 b784cd52953206eecd4a9cf12e66f9590b4658ab SHA256 d99644293dd83d11d0d4755cfb62951c21591d55386838378149260098ba6727
+EBUILD ca-certificates-20110502-r2.ebuild 2841 RMD160 7c01b64c70732cc3b6f697f42dedda327bba03c2 SHA1 0d27a4bc3ebca59cd310da52a53831c58a21f241 SHA256 8529882e5173dfcacd2fde47ed45b36fbfd62cced78264c2cf5334dc2b9f985e
 EBUILD ca-certificates-20110502.ebuild 2120 RMD160 eff412c030efac5272b3109326d483857cb62f67 SHA1 533aa547d6360b0cd5af7b696763cd22d5e33abe SHA256 11ba88945cc66cc74f3e2236f0be28ed5e55162b7f1133929f7c4d6c7081dc05
-MISC ChangeLog 7547 RMD160 7799ba0a5209654be11fca35afa28bb71dc8dc28 SHA1 59aa803bc1181e7de9a280e66ce2133cb394b0cc SHA256 c0a3b43978ca1d9af12deb2a3c0586eeb0872429d7d2e57844fe36490a99f709
+MISC ChangeLog 7807 RMD160 6c3b3a4fb982ed88aca095fe20a556a3a6a48be2 SHA1 00881eaaa5488ef08f532f466c4e5862db1adfa5 SHA256 43b871a80106cc57a281d2515d1f3591bae39387d67c1cf043f944fe2998d1c6
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk5hFqwACgkQaC/OocHi7JaaDQD/Y09w+Eta3xcWOHWx7/2MltwW
-9TQMr9NC171pWvHcRp4BAIWRxTmzWPS7MF90V5BcbaODzOb6I5rXif7ZugQRuUfG
-=64QX
------END PGP SIGNATURE-----
diff --git a/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild b/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
index 425ba1c81d9f..ab3f36091394 100644
--- a/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v 1.1 2011/09/02 17:47:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ca-certificates/ca-certificates-20110502-r2.ebuild,v 1.2 2011/09/02 19:08:32 darkside Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils
 
@@ -12,20 +12,21 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}+nmu1_all.deb"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp sys-freebsd/freebsd-ubin )"
 RDEPEND="${DEPEND}
 	dev-libs/openssl
-	sys-apps/debianutils"
+	sys-apps/debianutils
+	kernel_AIX? ( app-arch/deb2targz )" # platforms like AIX don't have a good ar
 
 S=${WORKDIR}
 
 pkg_setup() {
 	# For the conversion to having it in CONFIG_PROTECT_MASK,
 	# we need to tell users about it once manually first.
-	[[ -f /etc/env.d/98ca-certificates ]] \
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
 		|| ewarn "You should run update-ca-certificates manually after etc-update"
 }
 
@@ -48,13 +49,14 @@ src_compile() {
 	find * -name '*.crt' | LC_ALL=C sort
 	) > "${S}"/etc/ca-certificates.conf
 
+	sed -i "/^ROOT=""/s:=.*:='${EPREFIX}':"	"${S}"/usr/sbin/update-ca-certificates || die
 	"${S}"/usr/sbin/update-ca-certificates --root "${S}"
 }
 
 src_install() {
-	cp -pPR * "${D}"/ || die
+	cp -pPR * "${ED}"/ || die
 
-	mv "${D}"/usr/share/doc/{ca-certificates,${PF}} || die
+	mv "${ED}"/usr/share/doc/{ca-certificates,${PF}} || die
 	prepalldocs
 
 	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
@@ -62,16 +64,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -d "${ROOT}/usr/local/share/ca-certificates" ] ; then
+	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
 		# if the user has local certs, we need to rebuild again
 		# to include their stuff in the db.
 		# However it's too overzealous when the user has custom certs in place.
 		# --fresh is to clean up dangling symlinks
-		"${ROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
 	fi
 
 	local c badcerts=0
-	for c in $(find -L "${ROOT}"etc/ssl/certs/ -type l) ; do
+	for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
 		ewarn "Broken symlink for a certificate at $c"
 		badcerts=1
 	done
@@ -79,6 +81,6 @@ pkg_postinst() {
 		ewarn "You MUST remove the above broken symlinks"
 		ewarn "Otherwise any SSL validation that use the directory may fail!"
 		ewarn "To batch-remove them, run:"
-		ewarn "find -L ${ROOT}etc/ssl/certs/ -type l -exec rm {} +"
+		ewarn "find -L ${EROOT}etc/ssl/certs/ -type l -exec rm {} +"
 	fi
 }