Fix USE=doc, bug #383001

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/dev-libs/xapian/ChangeLog b/dev-libs/xapian/ChangeLog
index d0562d7ff8331376d251d6b0f82ed6cc4a79de1e..d21fe8c24dbfb1318857194dd3d8e30445cd7e36 100644 (file)
--- a/dev-libs/xapian/ChangeLog
+++ b/dev-libs/xapian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xapian
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.62 2011/09/15 12:28:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/ChangeLog,v 1.63 2011/09/16 19:36:37 blueness Exp $
+
+*xapian-1.2.7-r1 (16 Sep 2011)
+
+  16 Sep 2011; Anthony G. Basile <blueness@gentoo.org> -xapian-1.2.7.ebuild,
+  +xapian-1.2.7-r1.ebuild:
+  Fix USE="doc", bug #383001
 
   15 Sep 2011; Anthony G. Basile <blueness@gentoo.org> metadata.xml:
   Added myself and Johan Bergström as maintainers

diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 7d60445a7c9492efa2b39769d5cd65624b392222..8f616e5879a75d617a9a780c7280a7c856556c53 100644 (file)
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST xapian-core-1.2.5.tar.gz 3935134 RMD160 0af83c4150487f61f9752ed01125b000b2c7f01c SHA1 671e208c0633e0500e6f7ed9ab6cbb84722eeb3b SHA256 392ccfccb4372725be24509e5ee95a7422f07c3d47d0cbdbb8545e789cc936f7
 DIST xapian-core-1.2.7.tar.gz 4069085 RMD160 fa2f5b376bc19bdbbeab28e5de718e2f627f156d SHA1 c6c5c5b14d5d64481858ac2b181429a9b8bdc9a1 SHA256 6ce8cb3502f35245ec0cb0dcf579ce4f65c015a2f2e8d1b4c388c95f58278c89
 EBUILD xapian-1.2.5.ebuild 729 RMD160 fa1d4692231ad65ff4eb1c006a6bd83ffa1defae SHA1 9e93590ef4a41a839afb70fef9c804a2692c8d06 SHA256 710b8c5176de0c38eddfcd0ed41dadff19c15b305128bff40825bb2fab0db2da
-EBUILD xapian-1.2.7.ebuild 812 RMD160 f9279e8a554f858356d2b7fe3d1e48f67f814d7c SHA1 b91eb4a51bafce73d861229d5287e88f1b0acb2e SHA256 d4719674e0e3375274862aba8a6a80aede4186b21ba0f9a77de75232c4678a58
-MISC ChangeLog 8526 RMD160 dcc21f42e46efb4320a2c26324dca08804a61856 SHA1 5f706e417681fe4590345220acd5fee38168b5e1 SHA256 a4747831071534b7a2c2fbb7125ea7e856155fff8eafb14a5bfbf14dc7c11614
+EBUILD xapian-1.2.7-r1.ebuild 837 RMD160 8068c7d9ca1d959631898a0c2032f522aa8bddc9 SHA1 bebbb81af43d2aaecbdaa70f2f5bc34c172055b0 SHA256 3d90f738c7d068f6d437b4c1ca2093a5c0e9f7ea220be7e32bebe71a8d318c83
+MISC ChangeLog 8692 RMD160 61f9d580a669bf6cf993cb0e19c4e805288bda55 SHA1 a660217e0aa229e4943b545a07e8c405b9ae4550 SHA256 7a69be0f303ed5b64b8e266949467c859b303183ddce86554b78016ac06dd9fc
 MISC metadata.xml 750 RMD160 1f3972490b20faf2fe1f007b5eb3a950c41bfd01 SHA1 a7b3e9fa038de155adc5e66551c2f9dfaab87484 SHA256 7451951047d59705dc638634493c9b8ba0d14941549dee1af83fd4faaeacd1ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk5x73cACgkQl5yvQNBFVTWOfwCglrBrb7gs4mHsmeyH95Kkz9Ei
-KukAn3gJ/jgKg0pmEYmSLukP0YQ4b3Gk
-=h0lr
+iEYEAREIAAYFAk5zpU8ACgkQl5yvQNBFVTXXqgCcDXO7BkJNpHGaS7Acmay2SR+i
+8ZQAn2viPTuZZ7LmxKsWwj7RQcnRUdXK
+=3V+6
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/xapian/xapian-1.2.7.ebuild b/dev-libs/xapian/xapian-1.2.7-r1.ebuild
similarity index 73%
rename from dev-libs/xapian/xapian-1.2.7.ebuild
rename to dev-libs/xapian/xapian-1.2.7-r1.ebuild
index 4e49ff9050c60a906c7e632d90acbe6c03705201..69360519d4cd0320555e15fa84d9834bb446cbf2 100644 (file)
--- a/dev-libs/xapian/xapian-1.2.7.ebuild
+++ b/dev-libs/xapian/xapian-1.2.7-r1.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/xapian/xapian-1.2.7.ebuild,v 1.1 2011/09/15 11:26:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian/xapian-1.2.7-r1.ebuild,v 1.1 2011/09/16 19:36:37 blueness Exp $
 
 EAPI=4
 
@@ -27,9 +27,8 @@ src_configure() {
 src_install() {
        emake DESTDIR="${D}" install
 
-       if use doc; then
-               mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
-       fi
+       mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
+       use doc || rm -fr "${D}usr/share/doc/${PF}"
 
        dodoc AUTHORS HACKING PLATFORMS README NEWS
 }