arm/s390/sh stable

Package-Manager: portage-2.1.2_pre2-r5

2 files changed, 28 insertions, 17 deletions

diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 380d669db26a..282c17c42399 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rpm-4.0.4-glibc2.3.diff 495 RMD160 0d75fdb3dd1729678d89be563ea0ab4641eac383 SHA1 107cf4a3dd3a5ef5a2703a7e58a2a4b1ae0f24a0 SHA256 599c2ac6e8d800030659c2403e50bb7e58202daaea8431aa38ddc3bafaae35c4
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
 RMD160 0d75fdb3dd1729678d89be563ea0ab4641eac383 files/rpm-4.0.4-glibc2.3.diff 495
@@ -67,10 +70,10 @@ EBUILD rpm-4.4.1.ebuild 2642 RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 SHA
 MD5 863d2e6bd7eaaf7d740b0327d1a7d28f rpm-4.4.1.ebuild 2642
 RMD160 8099f3ef103b4d331562dca00acdeeeb841c6cc6 rpm-4.4.1.ebuild 2642
 SHA256 acef5da64da227223b8b04fa81f9158dac04be759bc23ab7048ca12d30712505 rpm-4.4.1.ebuild 2642
-EBUILD rpm-4.4.6.ebuild 2650 RMD160 8885a57c37718d01bb49947361efa16bfa76b3e4 SHA1 e2d79950437c0680017edb52782b194b07bb87c4 SHA256 c091ce1a3b153c67175118440538763d9e91aa9b394966ac73f577d7fda78aab
-MD5 0e4b79832dbbbe38aebf0c03fd9443aa rpm-4.4.6.ebuild 2650
-RMD160 8885a57c37718d01bb49947361efa16bfa76b3e4 rpm-4.4.6.ebuild 2650
-SHA256 c091ce1a3b153c67175118440538763d9e91aa9b394966ac73f577d7fda78aab rpm-4.4.6.ebuild 2650
+EBUILD rpm-4.4.6.ebuild 2668 RMD160 792226460483e4ff43000ed9e84bbdb6cb0f29c4 SHA1 09f17a36566fac4f006197fb53aa5df12d6f171b SHA256 68ff3f559a36190d765b41759d6bc88a3d57ac76808de3df524a8fc9a34482f2
+MD5 a83e2aa353638295dbca107b45692ad8 rpm-4.4.6.ebuild 2668
+RMD160 792226460483e4ff43000ed9e84bbdb6cb0f29c4 rpm-4.4.6.ebuild 2668
+SHA256 68ff3f559a36190d765b41759d6bc88a3d57ac76808de3df524a8fc9a34482f2 rpm-4.4.6.ebuild 2668
 MISC ChangeLog 9327 RMD160 335ed3d0c71d9d3f04e7819882212037642857e9 SHA1 7ecf627378c0ff2c6331cc2a30c405f065b3a811 SHA256 e50b23168dde29ae772f16a53914a35edaed60ee88df5e010ced9ca33bea9f08
 MD5 58378fc0c367b4c5706bf1d5f1321e83 ChangeLog 9327
 RMD160 335ed3d0c71d9d3f04e7819882212037642857e9 ChangeLog 9327
@@ -103,3 +106,10 @@ SHA256 db4eebd4f82cd87ab079bb9f098dca159877165316dbdcb54d2a9ae50667aacb files/di
 MD5 5ee2f2cd59d279b728247d54548a3529 files/digest-rpm-4.4.6 235
 RMD160 cb1beebaaafaa9024dca4713846df4da6877e723 files/digest-rpm-4.4.6 235
 SHA256 1a9d97d24a7c07cfd808a471e9fd22ced0813b41a109f6716b1d216fc828ecce files/digest-rpm-4.4.6 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD4DBQFFKCAhamhnQswr0vIRAoq7AJUeGHTSD4+vnUoZDZZfdAA8aR33AJ4x+V3K
+W1I2byGDpmSiH7cgdIaZAQ==
+=iu5l
+-----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.4.6.ebuild b/app-arch/rpm/rpm-4.4.6.ebuild
index 3491ad3602f9..ca509e5f89fc 100644
--- a/app-arch/rpm/rpm-4.4.6.ebuild
+++ b/app-arch/rpm/rpm-4.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6.ebuild,v 1.6 2006/10/01 19:38:24 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.6.ebuild,v 1.7 2006/10/07 21:45:47 vapier Exp $
 
 inherit eutils autotools distutils perl-module
 
@@ -10,8 +10,9 @@ SRC_URI="http://wraptastic.org/pub/rpm-4.4.x/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha -amd64 ~arm hppa ~ia64 ~mips ppc -ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha -amd64 arm hppa ~ia64 ~mips ppc -ppc64 s390 sh sparc x86"
 IUSE="nls python perl doc sqlite"
+
 RDEPEND="=sys-libs/db-3.2*
 	>=sys-libs/zlib-1.1.3
 	>=app-arch/bzip2-1.0.1
@@ -25,15 +26,14 @@ RDEPEND="=sys-libs/db-3.2*
 	nls? ( virtual/libintl )
 	sqlite? ( >=dev-db/sqlite-3.3.5 )
 	net-misc/neon"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/rpm-4.4.6-with-sqlite.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/rpm-4.4.6-with-sqlite.patch
 
 	# the following are additional libraries that might be packaged with
 	# the rpm sources. grep for "test -d" in configure.ac
@@ -52,7 +52,8 @@ src_unpack() {
 
 src_compile() {
 	python_version
-	econf --enable-posixmutexes \
+	econf \
+		--enable-posixmutexes \
 		--without-javaglue \
 		--without-selinux \
 		$(use_with python python ${PYVER}) \
@@ -66,12 +67,12 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	mv ${D}/bin/rpm ${D}/usr/bin
-	rmdir ${D}/bin
+	mv "${D}"/bin/rpm "${D}"/usr/bin
+	rmdir "${D}"/bin
 
-	use nls || rm -rf ${D}/usr/share/man/??
+	use nls || rm -rf "${D}"/usr/share/man/??
 
 	keepdir /var/lib/rpm
 	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS/{noarch,i{3,4,5,6}86,athlon},BUILD}
@@ -84,12 +85,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -f ${ROOT}/var/lib/rpm/Packages ]; then
+	if [[ -f ${ROOT}/var/lib/rpm/Packages ]] ; then
 		einfo "RPM database found... Rebuilding database (may take a while)..."
-		${ROOT}/usr/bin/rpm --rebuilddb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --rebuilddb --root=${ROOT}
 	else
 		einfo "No RPM database found... Creating database..."
-		${ROOT}/usr/bin/rpm --initdb --root=${ROOT}
+		"${ROOT}"/usr/bin/rpm --initdb --root=${ROOT}
 	fi
 
 	distutils_pkg_postinst