diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2012-02-20 20:46:09 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2012-02-20 20:46:09 +0000 |
| commit | 8bc4504d0cf2abf0d58dd8266e67156135618941 (patch) | |
| tree | fb2e4c9972fb00e0d92348c234fb987dc61e0a86 /app-arch/rpm | |
| parent | Drop unique use flag. Bug 404579 by Daniel M. Weeks. (diff) | |
| download | historical-8bc4504d0cf2abf0d58dd8266e67156135618941.tar.gz historical-8bc4504d0cf2abf0d58dd8266e67156135618941.tar.bz2 historical-8bc4504d0cf2abf0d58dd8266e67156135618941.zip | |
Fix #404479 - failed installation when USE="doc" was used
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'app-arch/rpm')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/rpm/Manifest | 30 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.9.1.2.ebuild | 11 |
3 files changed, 29 insertions, 18 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index 9f25ce60910e..1e8c09a8acef 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,10 @@ # 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.126 2012/02/18 20:14:40 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.127 2012/02/20 20:46:09 sochotnicky Exp $ + + 20 Feb 2012; Stanislav Ochotnicky <sochotnicky@gentoo.org> + rpm-4.9.1.2.ebuild: + Fix #404479 - failed installation when USE="doc" was used *rpm-4.9.1.2 (18 Feb 2012) diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest index 63b7131d1be6..9347eb7e1f06 100644 --- a/app-arch/rpm/Manifest +++ b/app-arch/rpm/Manifest @@ -22,24 +22,24 @@ DIST rpm-5.1.6.tar.gz 8305612 RMD160 88645f4a7c2e25fffaa5628d267e86eaac137b35 SH EBUILD rpm-4.4.6-r7.ebuild 3191 RMD160 5ca2a16ac107c914edbccccdf0d0b2ebeb96c4e2 SHA1 0b69289cf1bc48a453c0c7117e01dd1e4021005c SHA256 1c168326b03609d81932272281226a607db66a62f7ef3114a4baf07cca3f4676 EBUILD rpm-4.4.7-r6.ebuild 3250 RMD160 2c00c3042d9dda857903372084e386671811ad79 SHA1 7ffba60598cb1b4a88434316791e91ad17226e45 SHA256 8c58fe71a4a054848bd7304fe894d7c1b435a59a588b674dc4414b4d971deb4a EBUILD rpm-4.8.1-r2.ebuild 2467 RMD160 56c3aeed97ccfaf849afe5b2d76020b6176befc1 SHA1 bf088eef5b2d276e0afbc117d1b7979d195535c0 SHA256 c95eb9a186350496bb8ae8880adc37f7bb9afc04af804f61f0de04946c2ad650 -EBUILD rpm-4.9.1.2.ebuild 2346 RMD160 9788fc6c1cd7d2ffb02d7a98a55d4240ef6b00da SHA1 fbb5c3ea2a8f553128659b7b4d77c7b1d66048d1 SHA256 6c98a4addd785b38214079c2ff329bc4680e28b28dcf92f2047288536ef12281 +EBUILD rpm-4.9.1.2.ebuild 2443 RMD160 05de7349f94426203d6000cb12d4618276b3f95d SHA1 af300370962e4ef983bf6bef97a685e539853362 SHA256 61e6f7a9a27a8751e2981191c9e2ab6b9331bdab3c3af2b86cfc60f70f970876 EBUILD rpm-5.1.6.ebuild 2961 RMD160 af3d9eb849538de04e7ce81d58db72fc677cfa15 SHA1 ef6f5cbd788e174d6db219aef15fd45d9b139557 SHA256 af7970970ffcfb2d986e1aa53b4aba38bb5795d1d1c0ab7246d8e2c9e0a2f0f3 -MISC ChangeLog 19903 RMD160 b0fff9e5c4a41575304c74848ab9665bbe2bd352 SHA1 9ebd6ea045bff8890e07a451f99b93f12d7f6cc0 SHA256 c77b540c76ae489c7a6d6e7bc16803a0d197ac0b47eddaacfa7018e3259570c6 +MISC ChangeLog 20047 RMD160 47155af3b46b3df10bd1aae3f6899e48ba37acd0 SHA1 1428f9a2d4494573910bd3992d9d5779882ca454 SHA256 74ace776e38aa94f353b3c6dc39f7ac7820bf64cee343884462be86331ba516e MISC metadata.xml 412 RMD160 f80c92312d155e06f578bfafc5c6887a87a50029 SHA1 90899c21608493640f9e30dca30613b7823c9854 SHA256 49b33ada612c71654ff1706d78dbeb1d4150455e661c46b343cd5523386d3cd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJPQAa/AAoJELy9dS57CHJBaAwQAJrwS3sNKZSo+U267nIm1o38 -EP4NyJPcGD5GnDvoeAqZwTxp7nE3vjzcN2oFftdzcM42UOHsFfgldvOZc/eviVGq -Nz1hurE3i6gvsm5FgwC5RaPq4RJF/fqzTH9GnvoYBsD0bR7yX6aAPCf+LW+YCxjh -tEr4oY7RCgy09xUX9RHdmK3PoZwB7/LOrEC8ZX0eWVGTIAnjKBr+wJ4L48Nkuj4U -GjCRdBLbm0Y+Z2i5LddG2GTgSTAERCk/hFWoEsR/4n64Bi6aBZIPnLt1QDENLSSB -l5q/EDtbM4oIZ/8HSJ7yqkRSnctnean/eaBa5w99jG8aU0/v+IamArx40Kt59DLB -Z64zwjRNdimycK1FMHMAT3AtGIyhCF620jV+UE8DJU5h3moJTXaGBPa2Y22XvaA+ -lWRZJwsa9na9ofvQSLuYfPcbkXGgYBA8gVhrcqOyd90Pi4a3GE42JscMB/kZz2Al -seZn/EDlmLxgnNHGFOOGgXtkwmGiD4TwmWOXsi1ZgGRCzICg3+3tpzCz+HlXAgLC -YwlPaZIWXv6G1HX1y9H1n9DFFYqqj9WRt3DnP9+wjQdzjRdFQHrqL8NBx6EUKW8V -BN4f23eN9sRczz0746wV5g8VrZd9pf64W1ls/JzKovZkze569ZyF1jmrhYLmSwbk -DYGF0loalxecTFOaviE9 -=Kt7x +iQIcBAEBCgAGBQJPQrEYAAoJELy9dS57CHJBXAcP/0iaph0sq68vB0BlihpEI4FC +d/YOqucKZuSSIs/CO60Af7BybuvmPybHyZQF9zf/RBRxid5FkqwXSaiZNbDS412D +0xB40sfbJ6K3T+Xzsw0q2bmFSgBOfm826JJWC46LX1YRRFebod4RGCNqgPI7Hs8Q +vUJYjDZm9Tkct56pPnTAXd1B0f8r23sC8q68/NLDGCVx60LGTA+O2ncWwfWmJZ8W +hSwH287r8TJmpj4VZQqBWzU271OqqagWMXq2FwS1CwbLE1rkVJDPdE1Tr1gWVeyJ +9spYpxXfdiCriCkUmO/3DO7ujhWSWgq1/pvWDo+2xJr+asxCF7uKhuoDU+rAi97a +in2i4j40x8ZxgoX15nqOVchP/9fcOS3mPVI4LoYcwWn8XAVibHCh0ULJMLEUaUc6 +qguALQNQyEi7QWPpMtbKbt9ChagQKKrmM/3eR3r3y9u3mCSUFFUEo6blaGVFvPPP +e4V/xjdntSdGFWi/rjS9UGB7wC5s2FhLcmicHPifFHPOxvbU8Cq4yiQLzraavR7O +fhUupFDNKMT8lL39Fk0x7b0e0A05e+ABidh8AbJIajm9OLvN+qIRxMHfS1AvPPWN +n9o6j/dD3OHXS8MZvwJbSIM4ChD3z0f2zdYfVI5Rlv3SxuGdnbvZto8tVFF4/uIa +t26cEhk3AobxZ4rPF+R7 +=7ozf -----END PGP SIGNATURE----- diff --git a/app-arch/rpm/rpm-4.9.1.2.ebuild b/app-arch/rpm/rpm-4.9.1.2.ebuild index 4cb07739bef2..cac3e8eabd33 100644 --- a/app-arch/rpm/rpm-4.9.1.2.ebuild +++ b/app-arch/rpm/rpm-4.9.1.2.ebuild @@ -1,6 +1,6 @@ # 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.9.1.2.ebuild,v 1.1 2012/02/18 20:14:40 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2.ebuild,v 1.2 2012/02/20 20:46:09 sochotnicky Exp $ EAPI=4 @@ -83,7 +83,14 @@ src_install() { keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD} dodoc CHANGES CREDITS GROUPS README* - use doc && dohtml -r apidocs/html/* + 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 |