Fix files wrongly installed into /usr/share/doc/${PN}, reported by jdhore.

Package-Manager: portage-2.2.0_alpha78-r1/cvs/Linux x86_64

diff --git a/dev-libs/lzo/ChangeLog b/dev-libs/lzo/ChangeLog
index 4f9ede582a74b99ce93bb6017f0bb63545cacb1d..ab02a86a197682424488c68abd1fdc46759628c1 100644 (file)
--- a/dev-libs/lzo/ChangeLog
+++ b/dev-libs/lzo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/lzo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.60 2011/08/20 18:22:46 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/ChangeLog,v 1.61 2011/12/02 02:44:18 binki Exp $
+
+  02 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> lzo-2.06.ebuild:
+  Fix files wrongly installed into /usr/share/doc/${PN}, reported by jdhore.
 
 *lzo-2.06 (20 Aug 2011)
 

diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 3b3d38e5fa097111fa2b1dfd46ad0684babf1340..2eee886a3eecea2e395575676959f1ceb828ab3e 100644 (file)
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -6,15 +6,23 @@ DIST lzo-2.05.tar.gz 587694 RMD160 206ecf9b2d1aaada97268fbf422439de21ef3d15 SHA1
 DIST lzo-2.06.tar.gz 583045 RMD160 744b6562501954ba5441c6874963a1a5c81e7232 SHA1 a11768b8a168ec607750842bbef406f11547b904 SHA256 ff79e6f836d62d3f86ef6ce893ed65d07e638ef4d3cb952963471b4234d43e73
 EBUILD lzo-2.04.ebuild 916 RMD160 b1c15163fbd51a5a4c0048f3b20b9cda70316e5f SHA1 3e7ef85ea0c19b3edb665e63cd4d3d60702981ca SHA256 f0771327d7bcd5bf8e6c194942fbf4613a5b6ce04d5af2a721e8f260019b087a
 EBUILD lzo-2.05.ebuild 937 RMD160 cebc6ed0657d6ca9d8f6d270f5e145cc4a388e84 SHA1 002b5ce767671d2c6079e81ebf32bd299c1c296e SHA256 40616e6e682af65bc145e9188d3e7f380180b42064a45e4393b6b7f761352808
-EBUILD lzo-2.06.ebuild 919 RMD160 6bbcb14528340eb9796f3f59222e37aeda2e3e58 SHA1 20e636a2a378d5dc0f7755b82682dbacb21742a6 SHA256 6865bef25a3c6c36a7daf1c34a092d5fb9682cea57630a8db6f186a23f7ec7a4
-MISC ChangeLog 6587 RMD160 164d42b654b565d544f6f959be173e7f6336f239 SHA1 f6d5ab4b6216d6b064ad0d511836178a327db1a3 SHA256 7b9b4235aa229303da4d5fab58cdfa1d77cbf5d5b992593f72f4544a8e6c5bd0
+EBUILD lzo-2.06.ebuild 997 RMD160 52b1d3abd831c20a46ce6f75551ab7c8067689c8 SHA1 e665cda2205fc98bda6bca996a312edc1bfac454 SHA256 5c949e83d93744841f3c5a31364f90c8f05f8106d1b7bfea49dbee3640eccaf6
+MISC ChangeLog 6734 RMD160 bc68dc3feedc3fcb238cc880f8a2693e302d8899 SHA1 1f83311485f91ca1961ce743c30020fcad269177 SHA256 bc33e707edce76a4206f3be2d9be6dc9ca8178ca77e0a4f56ff6c2ce0f1c0217
 MISC metadata.xml 250 RMD160 915e9f7631b5452f7e9a4611e456c3786d233efb SHA1 f58c569faafda9f7ecf1df7144510f5a8fe3f4d5 SHA256 da54ddc59e30b9efeee50c84cd1411ec8f638f93f744e7e525fa80eb4c3c6e99
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C6YACgkQfXuS5UK5QB055gP+JcGfPU1E/4n21HrhNG+gcHou
-MqoWh2Kap4vtWNrgV1TMkW9COLo3mF7e0YiHxb8nY6zh3kFUxzX7uW2mtq0F6c8n
-+44ctiyfW/cR7qTxJf/TD9gnz67RaQT6AWSPE4iOy7j4dIOLY8JMOnoRCMONU3MN
-gDzDFuUqaLES3mlz6J8=
-=hAwz
+iQIcBAEBCAAGBQJO2DqWAAoJEHQ6UuhrqBBQOFsP/Rq8ywLGEKK/c4TW8C0eMrpQ
+xT/sij/3EJBti0qFgcLk0Ztckl0MZiq7fBoCiHP9cEMacFIA3WrsG6sq2uRenrlI
+5PxKGiuFWiAFQYdYSmNd+oZ4DhKxZP0uTCcsFKaUcsUmxWSE4kUwzWr5Cna7Fdg6
+EkSBhJvQuYc7eYG2vEytEwKolpEDFuJzAeeNuZx7hDcr3ro4OMX9XJ9vhdfNpobN
+YnSMsGTKH3Y3uWwzLGaRYF0LMn5ymTNt4WSo4LKbRzSmWFy1DLl2E+GmUoTgAvaB
+nCe6SiKzu9PmjGgMRuQCs5SYqpq4FsuI3wBDLZHIP3CRaYmXI9pciCOJKHIx9/bj
+DfDd6UqTI4T2la59cvRqTvy0rMKqGQckGTWry8VHaC2esZAoEEFCQijCZc3xYGPo
+tXueqhEffoFCdRW3zge/+Pq6N+lb9vtT41ls0xURUpqfaoyOLZeSdKgV0fpgF8iw
+KhCkVy5nH7KW8ncJIDHiBSdm+4vv6LdRj4UZrLtZSlqrWYPBSBEi1XbWcM4fFFaU
+zqgtYqO5ZfWDjzeazGcfqcNvBoVddOSHOLxWvR4VC+efIs2S9VMPyotbKShjWviV
+Ow7OTe8sgmed/xrAYFT9oUXb6piAfFRSaWttZHDXWC02w4fiohF4uBKrFstqV5C2
+bqJSChCQVRtRSy0zzluN
+=HpEu
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/lzo/lzo-2.06.ebuild b/dev-libs/lzo/lzo-2.06.ebuild
index 67a8d6f3b3aa619f397043e533c3fe68f12343fc..c46a6469d291611aea8593d6603be303ed079b95 100644 (file)
--- a/dev-libs/lzo/lzo-2.06.ebuild
+++ b/dev-libs/lzo/lzo-2.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.06.ebuild,v 1.1 2011/08/20 18:22:46 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.06.ebuild,v 1.2 2011/12/02 02:44:18 binki Exp $
 
 EAPI=4
 
@@ -15,6 +15,7 @@ IUSE="examples static-libs"
 
 src_configure() {
        econf \
+               --docdir="${EPREFIX}"/usr/share/doc/${PF} \
                --disable-dependency-tracking \
                --enable-shared \
                $(use_enable static-libs static)
@@ -22,7 +23,9 @@ src_configure() {
 
 src_install() {
        emake DESTDIR="${D}" install
-       dodoc AUTHORS BUGS ChangeLog NEWS README THANKS doc/*
+
+       dodoc BUGS ChangeLog README THANKS doc/*
+       rm "${ED}"/usr/share/doc/${PF}/COPYING || die
 
        if use examples; then
                docinto examples