Version bump to 4.10.0 release.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 140 insertions, 15 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index fca6c0adb746..5012689a7e54 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/rpm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.141 2012/06/01 13:59:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.142 2012/06/01 14:19:27 scarabeus Exp $
+
+*rpm-4.10.0 (01 Jun 2012)
+
+  01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +rpm-4.10.0.ebuild:
+  Version bump to 4.10.0 release.
 
 *rpm-4.9.1.3 (01 Jun 2012)
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index a4cb9ffe626e..1ade1b3f7e12 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -15,30 +15,32 @@ AUX rpm-4.4.7-stupidness.patch 5268 RMD160 631f1bf3dc4553e27dec4a901fa84e17ffc7c
 AUX rpm-4.8.1-autotools.patch 929 RMD160 9b4b1b08e38f79522a5b1e6ab487ed89b8234add SHA1 f20c1d98d325efa64f54b046cda6a8b5d4463da4 SHA256 2280de624d171399bb48dd4ae9144063ae4ab17f87e57313ba664a234a90e512
 AUX rpm-4.8.1-db-path.patch 628 RMD160 cee347c45bbbebd724dd1346bd74b3344b6a7d06 SHA1 08c3aa65104db74c9851911970711b2f503dfcc8 SHA256 791682c72dd3a24e5e8268bfa967412035aa135c7b8d4673541bed129b89a0f3
 AUX rpm-4.9.1.2-libdir.patch 1056 RMD160 f9407d89f097a746947b7817f095dbe2ef07983e SHA1 74aea2f9b006b96a42625e0d895bc9f27ebaa0da SHA256 e4beb68b13861ccedcaa0a90c49f42c6dd7a2d7799360798b21eec7ea689437c
+DIST rpm-4.10.0.tar.bz2 3530378 RMD160 c14371d6f37abdcb007fb092a755953f886d8316 SHA1 d78f19194066c3895f91f58dc84e3aad69f0b02c SHA256 0e2e237235b64c07ee4a4152e4eb77aad4eb559737eac9b6713c5e1bcabfe4a9
 DIST rpm-4.4.6.tar.gz 17157249 RMD160 6b433d20a63fb2542244ae62eff0a8b5fe290439 SHA1 33221f95189671d1a083b4f140bcf9a88ecd4374 SHA256 1e1da50af2b9dfe34c79315eae7520e7e57087671e17ce26107d779ae2b0b595
 DIST rpm-4.9.1.2.tar.bz2 3500371 RMD160 3b3a8904f9f0d8ae03c1ab903ca7f420cb9178ee SHA1 5ec557424d90461f76d4ad30bfb6653b79920d58 SHA256 ea55e5c5b70703a3fea33e5debec27a694816ae86d1bf5ce99bc9e27db84b60a
 DIST rpm-4.9.1.3.tar.bz2 3485850 RMD160 6c9860c3d6f26c86e9512df94bf4cf8ebef5b10b SHA1 d1157a05a2368de07e06638daee01d3749107c8b SHA256 531894301e1a9891baf356fb32f732b10d1b313f5c5875a47fdcbdc0c3f67883
 DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SHA1 3ab7d1edf333102c748c22e9144ab90d9719ab0b SHA256 82ee1a737bd77ddd90b0fe1e9a2f478c46033e451fac3881d00ab9e166951799
+EBUILD rpm-4.10.0.ebuild 2646 RMD160 a482d2bb01039931ae6dd0d3eff29a887aaa784b SHA1 6a3198180eca8e6445269943ad7742355b009911 SHA256 48b27895d4317e6f8bc893bbd37ed86aaf4d68009c52edddbc0d61bf3c3a5aba
 EBUILD rpm-4.4.6-r7.ebuild 3191 RMD160 5ca2a16ac107c914edbccccdf0d0b2ebeb96c4e2 SHA1 0b69289cf1bc48a453c0c7117e01dd1e4021005c SHA256 1c168326b03609d81932272281226a607db66a62f7ef3114a4baf07cca3f4676
 EBUILD rpm-4.9.1.2.ebuild 2489 RMD160 b64969def0d21696540fddc9487d45236b8b926a SHA1 b791124a00b05a00200919a43564756bb5ab119f SHA256 d391dc7ad4a43b64422ab6e506883a936a7336b0e25cb9e1ef55d2479bbe080e
 EBUILD rpm-4.9.1.3.ebuild 2604 RMD160 fa34b8bf64646415ad2b1678c1de3616fb1a1e93 SHA1 90b7705ec3eb7514913f4fb2c6c5c7926364ced3 SHA256 8d5a6de694392a420bafd69545cd80f9fceb9b5de49a54c0f3c2e23910345342
 EBUILD rpm-5.1.6.ebuild 2965 RMD160 2def9d4e44cdfd12f8b4e7744064726bd23170ba SHA1 7c0a66d7a69fd4de660215718275e45dd870c62e SHA256 e54e87adb9d2947e6ce00c0bbffd022b2be989de27c76feab55adc70e0195b4e
-MISC ChangeLog 22031 RMD160 d3618dbfca304bdf099f4b45138bd6e5edea8167 SHA1 d5dcc4082860de47bcbff7f91eceb3a3f4486be1 SHA256 4482acd95e383bd4d6c68cf540136a20f8a896adb843c1fab7acb302a8e56c2a
+MISC ChangeLog 22168 RMD160 ce630ed45d369f831bf89b5a58e94e7182bea97a SHA1 943c4564efa8b52b4aa01c23541cc6240a8ad8d1 SHA256 90098356dc386d0b6f2cff6ac9076eac4aacfd0880ee410d79c21972ee2aad6f
 MISC metadata.xml 412 RMD160 f80c92312d155e06f578bfafc5c6887a87a50029 SHA1 90899c21608493640f9e30dca30613b7823c9854 SHA256 49b33ada612c71654ff1706d78dbeb1d4150455e661c46b343cd5523386d3cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPyMq1AAoJEOSiRoyO7jvobP8P/jsKTMW6QZbdj2wj1SQ1rfvk
-wieAOQkt6NI/qo34l/lBHF+C/IOQRV1TOH6F9KIj3DeH6Zw+Shcr+P85OEcw+5M9
-W+BhTcRfjkMH64ATRKdkhhsDxraquG867kUp3lIRa1hzTARm7YpODCigIS5jpQN+
-465NGqUDsEfJeMTwyUweFhQOVaBDZ0gJoZJbRtmJ2EFMCgi9bHXAv853Y/cTCEo8
-UQRnFwiNRp6aYRvmZ05+MWDJaNVwChZTbUcFmJwndNFmbEf0BGMf2XYNtB3MU56f
-WaQHR4o/LLwT5pIwkhv5FSwouiA7Os3/SQmpXa7+ZE27W7LDaiKB50hjX4uYrot6
-oemA+FA/OpSGtj5Dfo/RTZHL1Ni2zswE96JVRF1GY0jPH2U2g7dopa7ikc7FCx+u
-HIL5ocnkVlLlJVzap0EuESPg18YTrSfnmfuWH/5NBL6hrPN+gw1AjkH/Uu3HzKkL
-UNUB8UrCuStx5Vb0pXpnetT7VGEOQLcrlgSmAk3d2cw9Kbz4qHq81XcUqJsCI2c6
-VjaR5N2ARsv9EKIcd+OZZVZ9UtkVx02QNRkeJbWMhC7Y05XLI+sbQpWvRDvLmw/2
-soZiPVsToq85esLl7u7oKdD+qrhoEr4aiZ89eTq79+NoNzeLeZlDvgCA8tEE7hkm
-DMzAXzte1O/maJ4ifmj3
-=xDXq
+iQIcBAEBAgAGBQJPyM+wAAoJEOSiRoyO7jvoAAUP/2KOEnvx0UOyVjEHIn0ES7P2
+J5DjW7DuYaBWFkobRW2x/wm8ch0V+0Z/hGK1so6n7tzOuQ7uMY0/jltHFN5MgYWB
+9OYRW9gIQC1J0JKQSkEfMH0F+QOUKpjVv7eOmPrsPMXGUV9Sjj+jcDgSc8aszXkb
+PuelnmSzl1WUpzvUndGbsyzQ3Do6nWXShagzvWCyStH0MDOgAQlzJ322z6oKcn1R
+VWMoikvuu4DQm1uJTS7But9ujxYv7ZPFCGfNn0yQcXRsCrz6Mg0Ge2PnhB2gqceP
+CZMxw6wDufHSU2xSNWrBipe+oO6/8dokKFKJtgLTAzwHq/lkS7vjyIkGu0JxafTW
+gJlyjisTyTcSlJ11PgHHt4NlaSgni7GKv7jG/gQtObZjsnkiJysLgIO0+xvD1jMi
+FWL4hLkBNAU5sf1hFw/UY4eJMxKPF/7YakKXKxPOodV7+mLjvWaRLcaQzy3x/lp9
+pq+JdwxrFF9wYvNwoXq4i6q3Bu0kgoHk/ch5x4O5ELZrUq0MOFaEvVjldfq0VgaK
+49cMV0SOsF6e8QXAo8A4L1fsFJhAxvBAMZIpfrP8BWRvGvw0Ie1wq7HD5UG/tvit
+4mDluKU6NZ7k8NKbvGqbAKbntwbSnGhIvFG7dKWWuEqSPL4RWawPyPGhlf23X8Az
+vNYQ2NmM9WG16TKyrdnx
+=6Z8n
 -----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.10.0.ebuild b/app-arch/rpm/rpm-4.10.0.ebuild
new file mode 100644
index 000000000000..95661d061dcf
--- /dev/null
+++ b/app-arch/rpm/rpm-4.10.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.10.0.ebuild,v 1.1 2012/06/01 14:19:27 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit eutils autotools flag-o-matic perl-module python versionator
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-$(get_version_component_range 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="nls python doc caps lua acl"
+
+RDEPEND=">=sys-libs/db-4.5
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}