Use bash-completion-r1.eclass, remove the symlink fixing hack and use DOCS instead...

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

diff --git a/www-client/surfraw/ChangeLog b/www-client/surfraw/ChangeLog
index 3879e971899ad43b593bf2c1856503943bcc4121..4c68982d5005c2b7a634681039397fcdaacefced 100644 (file)
--- a/www-client/surfraw/ChangeLog
+++ b/www-client/surfraw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/surfraw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.63 2011/11/03 10:14:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/ChangeLog,v 1.64 2011/11/03 15:22:38 jer Exp $
+
+  03 Nov 2011; Jeroen Roovers <jer@gentoo.org> surfraw-2.2.8.ebuild:
+  Use bash-completion-r1.eclass, remove the symlink fixing hack and use DOCS
+  instead of dodoc by James Rowe (bug #389377).
 
   03 Nov 2011; Tony Vroon <chainsaw@gentoo.org> surfraw-2.2.8.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian

diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index d2a1e346248c580d9f6b9099c68b54dbe0d27fa1..4257bf5bc715d5781fb93ca3b49b2ecc8c2f0f53 100644 (file)
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -5,13 +5,13 @@ AUX surfraw-2.2.6-gentoo_pkg_tools.patch 1155 RMD160 18222308105ba992367e9d44acc
 DIST surfraw-2.2.7.tar.gz 169771 RMD160 aaab07dd942ad7fa0885d362132bc7db6d87b59c SHA1 18f7db3b85f6c8af784338b9af66bf84d9d33443 SHA256 1f23e08210ba04d874e825e6bbbdb23e669cf9c0804388ba0fdd0fd535995fcb
 DIST surfraw-2.2.8.tar.gz 183019 RMD160 77f8f625946fb76665c9e4834506ce4e45f1cd4f SHA1 3114cd6e8d64f87b84ed0eff4369bfb0b10f2eb6 SHA256 925075e05637e39458b00e859193aacde306aafd9a962f44f5114f81713539ec
 EBUILD surfraw-2.2.7.ebuild 2756 RMD160 b77a69c2048ac945c62ff58f8e20e4257a5acb92 SHA1 395f03d78eb7dd9f804f3b1c439564bc565c6513 SHA256 e7b5402b2bcf61e3f4095aecc239eda5de741e288f579583057a1abdcef5d561
-EBUILD surfraw-2.2.8.ebuild 2682 RMD160 ccef9ae041906e034226387f134b17e721252a5e SHA1 57445b88cef69b78f9770073b9720fe74ec7c149 SHA256 299131ceb47288963f6e7b39e15094019919e2f6635489d62582c6940a08eb2f
-MISC ChangeLog 8503 RMD160 afeccf5236ec45b9a5e6884c300182c544ede468 SHA1 e03fd0aab69d1086c88cba1c5f5642f487bec69d SHA256 eaf04785c4081efffae480c832782994787580f719b1f7154309b64220819703
+EBUILD surfraw-2.2.8.ebuild 2567 RMD160 9f388de35351122a13086f2ec1da2a96f77c6c8c SHA1 9ac211db190f748f259ecc24de9582a03919fea6 SHA256 41046df1941b1c91c6a417b6c8c5c1bede1c99d4999ce557b6793ae437789879
+MISC ChangeLog 8693 RMD160 3fdb8d461a69e9a77bc1103eca6ef4f206844668 SHA1 e1cfde5ad1bb76478cc4cef66e061c9129be0897 SHA256 84d2c443cc6176add3f9020ede8bc43a18e4924799d9fd26174efd89658d4adb
 MISC metadata.xml 1294 RMD160 b263dd379c6f1e9638fe61737645d3b94b76f174 SHA1 032f3ba0bda701b1f8b235fc03d84e13abd4a992 SHA256 054fe5b5b8d48dc9f499155441aee923c48203674459690b13f56e4f475a6189
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6yaa0ACgkQp5vW4rUFj5owmwCgnjaw33/aQp4DAWGT7ETARN1K
-GOsAoKtFodPVGhRAH88VFfKSRRiH5lXo
-=6P1x
+iEYEARECAAYFAk6yscQACgkQVWmRsqeSphPPXgCcC2UzO8Gx/MxYiJ4PNjtRqROy
+S8QAnjcdPw3TEURHpnLck1CQHabCqE6v
+=7Y9R
 -----END PGP SIGNATURE-----

diff --git a/www-client/surfraw/surfraw-2.2.8.ebuild b/www-client/surfraw/surfraw-2.2.8.ebuild
index ff3bb2c499f64ab408a48d0e40687d29d658c090..699881da077692f6e7ce518bea667a92709401ae 100644 (file)
--- a/www-client/surfraw/surfraw-2.2.8.ebuild
+++ b/www-client/surfraw/surfraw-2.2.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.8.ebuild,v 1.3 2011/11/03 10:14:50 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/surfraw/surfraw-2.2.8.ebuild,v 1.4 2011/11/03 15:22:38 jer Exp $
 
 EAPI="4"
 
-inherit bash-completion eutils
+inherit bash-completion-r1 eutils
 
 DESCRIPTION="A fast unix command line interface to WWW"
 HOMEPAGE="http://surfraw.alioth.debian.org/"
@@ -16,10 +16,10 @@ KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc
 IUSE=""
 RESTRICT="test"
 
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch
-       # Man page symlinks shouldn't link to compressed files
-       sed -i 's,\.gz,,g' links.IN
 }
 
 src_configure() {
@@ -28,9 +28,8 @@ src_configure() {
 
 src_install() {
        default
-       dodoc AUTHORS ChangeLog HACKING NEWS README TODO
 
-       dobashcompletion surfraw-bash-completion
+       newbashcomp surfraw-bash-completion ${PN}
 
        docinto examples
        dodoc examples/README
@@ -46,7 +45,6 @@ pkg_preinst() {
 pkg_postinst() {
        local moves f
 
-       bash-completion_pkg_postinst
        einfo
        einfo "You can get a list of installed elvi by just typing 'surfraw' or"
        einfo "the abbreviated 'sr'."