Fixes from Chris Mayo to cleanup doc handling #154907.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 368f7350278bdd9a9c73738ca1ce939155d2b40d..65b19514b9864bf213597a0220ff54570eb6e1e9 100644 (file)
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.130 2006/10/18 11:40:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.131 2006/12/28 20:45:22 vapier Exp $
+
+  28 Dec 2006; Mike Frysinger <vapier@gentoo.org> gettext-0.15-r1.ebuild:
+  Fixes from Chris Mayo to cleanup doc handling #154907.
 
   18 Oct 2006; Roy Marples <uberlord@gentoo.org> gettext-0.15-r1.ebuild:
   Added ~sparc-fbsd keyword.

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index ea143b955928db2d98047cd26ea03b92abfa87e8..7b4ed1b977ffadc3d8ab3dea9c7461c8d29d88ca 100644 (file)
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50po-mode-gentoo.el 322 RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 SHA1 b4017776f7abfc1267b8c0799ee512eef60f69ac SHA256 96e59f3fffb71699946e4b930dec98bce68a8234f598f4f85024ee61713991c0
 MD5 26632b2c8167333a89f1818c6cd5002d files/50po-mode-gentoo.el 322
 RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 files/50po-mode-gentoo.el 322
@@ -69,18 +72,18 @@ EBUILD gettext-0.14.6.ebuild 4027 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58de
 MD5 ceaf0fc1da75a74c7779f1981158dc48 gettext-0.14.6.ebuild 4027
 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58deb gettext-0.14.6.ebuild 4027
 SHA256 53df3dbe7d1777f44f451ab3452e9d53b15e103f8bf9d9292b6826c61404406f gettext-0.14.6.ebuild 4027
-EBUILD gettext-0.15-r1.ebuild 3933 RMD160 e978a146593d6a0e5c3cca38d5b8f8bf82d57b66 SHA1 8fe4e2da4f5aaf317402118cca9c1b7d150c5042 SHA256 b016bc05f573cc2577a0889bff1e774b9db250c303498fa018c9b24812b89adc
-MD5 d19def17b4862221e57537e50af8e232 gettext-0.15-r1.ebuild 3933
-RMD160 e978a146593d6a0e5c3cca38d5b8f8bf82d57b66 gettext-0.15-r1.ebuild 3933
-SHA256 b016bc05f573cc2577a0889bff1e774b9db250c303498fa018c9b24812b89adc gettext-0.15-r1.ebuild 3933
+EBUILD gettext-0.15-r1.ebuild 3724 RMD160 f52f74f160efe3be39ba83295e14e24436c49a14 SHA1 731ced24982603865bc0d04adb290bddda1222a1 SHA256 66b16f94b0a2ea79d47df2870ae7b79b483be00043667901ac4d0d923415f33b
+MD5 d5311d38469c9cdb769d67b1e2934c91 gettext-0.15-r1.ebuild 3724
+RMD160 f52f74f160efe3be39ba83295e14e24436c49a14 gettext-0.15-r1.ebuild 3724
+SHA256 66b16f94b0a2ea79d47df2870ae7b79b483be00043667901ac4d0d923415f33b gettext-0.15-r1.ebuild 3724
 EBUILD gettext-0.15.ebuild 3841 RMD160 708b9bbf7cfea2a97b3c0743e2d75779587a24ab SHA1 b2dea96d0be011f27c518dc2d910c6aea76e7927 SHA256 6b5f609bcfef4c9a5764a1d3fdbf4ade4032299a3aee9643b850b0f3028748f7
 MD5 489d0d1a767b5f8d8a4f96a17b50abdb gettext-0.15.ebuild 3841
 RMD160 708b9bbf7cfea2a97b3c0743e2d75779587a24ab gettext-0.15.ebuild 3841
 SHA256 6b5f609bcfef4c9a5764a1d3fdbf4ade4032299a3aee9643b850b0f3028748f7 gettext-0.15.ebuild 3841
-MISC ChangeLog 16473 RMD160 f22c582a9554e001e3cead8c84fa0d037f4068ce SHA1 d30d5380d2dc59eaf4cc6bf707d2ec8d15fb07a2 SHA256 67aebf6fa95222deef01c4243223ee2693b7287f9dd8fd9c5b8079612c003365
-MD5 04e79cc3d29a7a53b4961f8b80b385c8 ChangeLog 16473
-RMD160 f22c582a9554e001e3cead8c84fa0d037f4068ce ChangeLog 16473
-SHA256 67aebf6fa95222deef01c4243223ee2693b7287f9dd8fd9c5b8079612c003365 ChangeLog 16473
+MISC ChangeLog 16603 RMD160 07dfd19321d6cf779104e604044cb329fe1a3ecb SHA1 ad81a8c6299f598c4b8bc272bf9afb3dd473cfb8 SHA256 48f7e26a92b0d2c22f289421952f1792c12f16a9561676e72601d44db1f049bd
+MD5 d8fa23ee3982152e86c2aaee9d9e1f22 ChangeLog 16603
+RMD160 07dfd19321d6cf779104e604044cb329fe1a3ecb ChangeLog 16603
+SHA256 48f7e26a92b0d2c22f289421952f1792c12f16a9561676e72601d44db1f049bd ChangeLog 16603
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -109,3 +112,10 @@ SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/di
 MD5 17d746c8efa5e4286c26bf52fddc47d7 files/digest-gettext-0.15-r1 241
 RMD160 a0eac6fb612cbd682123137994a7183beea6aab0 files/digest-gettext-0.15-r1 241
 SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/digest-gettext-0.15-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlC0c8bi6rjpTunYRAom5AJkBqEP3w0KHFkhbrb9jZtSK27GQlACgz2Av
+8+1cRvleHjj6lUzgnKmwoA0=
+=r17E
+-----END PGP SIGNATURE-----

diff --git a/sys-devel/gettext/gettext-0.15-r1.ebuild b/sys-devel/gettext/gettext-0.15-r1.ebuild
index 26bf8cec2dd2a31447e9a64445a1927b4bc3da05..b47b84e423dba711d26b639b974fa1ea71c937bb 100644 (file)
--- a/sys-devel/gettext/gettext-0.15-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.15-r1.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/sys-devel/gettext/gettext-0.15-r1.ebuild,v 1.2 2006/10/18 11:40:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15-r1.ebuild,v 1.3 2006/12/28 20:45:22 vapier Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
 
@@ -33,14 +33,6 @@ src_unpack() {
                -e '2iexit 77' \
                autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
 
-       # use Gentoo std docdir
-       sed -i \
-               -e "/^docdir=/s:=.*:=/usr/share/doc/${PF}:" \
-               gettext-runtime/configure \
-               gettext-tools/configure \
-               gettext-tools/examples/installpaths.in \
-               || die "sed docdir"
-
        # sanity check for Bug 105304
        if [[ -z ${USERLAND} ]] ; then
                eerror "You just hit Bug 105304, please post your 'emerge info' here:"
@@ -59,6 +51,7 @@ src_compile() {
        fi
        use nocxx && export CXX=$(tc-getCC)
        econf \
+               --docdir="/usr/share/doc/${PF}" \
                $(use_with emacs) \
                --disable-java \
                ${myconf} \
@@ -101,11 +94,11 @@ src_install() {
                gen_usr_ldscript ${libname}
        fi
 
-       if ! use doc ; then
-               rm -rf "${D}"/usr/share/doc/${PF}/html
+       if use doc ; then
+               dohtml "${D}"/usr/share/doc/${PF}/*.html
+       else
                rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
        fi
-       dohtml "${D}"/usr/share/doc/${PF}/*.html
        rm -f "${D}"/usr/share/doc/${PF}/*.html
 
        # Remove emacs site-lisp stuff if 'emacs' is not in USE