Rewrite hack abuse of dohtml to use insinto/doins.

Package-Manager: portage-2.1.2.3

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 22768509d6df530a98e43413422748d1c237e247..15ad40a95be6c6a05a8400246b0515f1bf2901f0 100644 (file)
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/catalyst
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.166 2007/03/21 19:33:43 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.167 2007/04/07 04:20:04 vapier Exp $
+
+  07 Apr 2007; Mike Frysinger <vapier@gentoo.org> catalyst-1.1.10.10.ebuild,
+  catalyst-2.0.2.ebuild, catalyst-2.0.3.ebuild:
+  Rewrite hack abuse of dohtml to use insinto/doins.
 
   21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst-2.0.3.ebuild:
   Remove cdr from IUSE since we no longer use it and change the x86-fbsd check

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 2478382b3ac3d772a2428aa4804373e00cd793fd..bb1f9ca64255aca015dec4dd92465c5f58ae3045 100644 (file)
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -4,22 +4,22 @@ Hash: SHA1
 DIST catalyst-1.1.10.10.tar.bz2 570620 RMD160 18365ba9697c4e44091973daf709c497f1cb2b13 SHA1 86c5020914225eacdbd4d651adb8aa8ee65cc490 SHA256 2c3c0ef8970897f741e31ff6f84d400fa2ea3b8e6af7f1b4fb6ca1daff8048eb
 DIST catalyst-2.0.2.tar.bz2 782576 RMD160 06cd53d2ec71a69137f655c2b3b1dbf00f7852aa SHA1 a21b336df799fd1ee2ebd51dfb26388fbcd14069 SHA256 dec7118411f06322792720c8dc0977ae020552bdf2e35c5ef1735f37b2266a65
 DIST catalyst-2.0.3.tar.bz2 783648 RMD160 f59d8cb5e08464ebac8c3dbc7292903a4cc08812 SHA1 d3db2ad27f76bff67d3274856fadeb8b37bc5f7f SHA256 7355cb93f23071be80d10a5269b8f2a78edd9626cf4ad8f717a79139a4189ad5
-EBUILD catalyst-1.1.10.10.ebuild 2233 RMD160 13613649756a58bd265ed7c9c737494e5e2ec82c SHA1 e54e827844bf4968c4cf185c660cc32d75654a99 SHA256 18ba5a8a1eba33a54099196d05b874d2100a224c9cbddf32d8677796dcbf7617
-MD5 ac141510888ab08c761c926294f51e41 catalyst-1.1.10.10.ebuild 2233
-RMD160 13613649756a58bd265ed7c9c737494e5e2ec82c catalyst-1.1.10.10.ebuild 2233
-SHA256 18ba5a8a1eba33a54099196d05b874d2100a224c9cbddf32d8677796dcbf7617 catalyst-1.1.10.10.ebuild 2233
-EBUILD catalyst-2.0.2.ebuild 2432 RMD160 563882e2a6f07998910d35ee6e264341e4af251e SHA1 c370278bcace6933e4fd2b52e62c6cbf247fe278 SHA256 0ae5ad289687a085876b166b16e66ac410dfa86f6fe972c868d1a0605037f367
-MD5 ca2e044601af9c570a287efd74114a85 catalyst-2.0.2.ebuild 2432
-RMD160 563882e2a6f07998910d35ee6e264341e4af251e catalyst-2.0.2.ebuild 2432
-SHA256 0ae5ad289687a085876b166b16e66ac410dfa86f6fe972c868d1a0605037f367 catalyst-2.0.2.ebuild 2432
-EBUILD catalyst-2.0.3.ebuild 2473 RMD160 45f38248db0e45fcb8bc0d02daba1ecd3374fa3e SHA1 a6b39e66e26318e786f8a5d9e3c07d42440c7074 SHA256 4e2da3a1e4818dd57ee3f0d08cf5d182001958c3d46115b8ac6910350bd54a15
-MD5 3ed5fe1deef6429840d70ae70a7d2e12 catalyst-2.0.3.ebuild 2473
-RMD160 45f38248db0e45fcb8bc0d02daba1ecd3374fa3e catalyst-2.0.3.ebuild 2473
-SHA256 4e2da3a1e4818dd57ee3f0d08cf5d182001958c3d46115b8ac6910350bd54a15 catalyst-2.0.3.ebuild 2473
-MISC ChangeLog 36575 RMD160 9166670fd7f43111f0cc9b3020dbd84131274d45 SHA1 6f6a4defe96b118ab925ab0703837bd8ce9848ee SHA256 c1ed50bb003afd521833e4ca109a097e1760443fdae134965f4e45bd06b1375c
-MD5 e5d1237a211a3e61ed5906003146b531 ChangeLog 36575
-RMD160 9166670fd7f43111f0cc9b3020dbd84131274d45 ChangeLog 36575
-SHA256 c1ed50bb003afd521833e4ca109a097e1760443fdae134965f4e45bd06b1375c ChangeLog 36575
+EBUILD catalyst-1.1.10.10.ebuild 2237 RMD160 032d4d4104be35b1c1fdc7e031515b571341982e SHA1 88e43e7cdba883ea1fe7aa024d59014d1a03a619 SHA256 c5bea5957bf67ce443d8b5d381f8c966512396807d33abfd014aa3d0d346ebc6
+MD5 7482c5ec8be950b9e681e3fa95a1957d catalyst-1.1.10.10.ebuild 2237
+RMD160 032d4d4104be35b1c1fdc7e031515b571341982e catalyst-1.1.10.10.ebuild 2237
+SHA256 c5bea5957bf67ce443d8b5d381f8c966512396807d33abfd014aa3d0d346ebc6 catalyst-1.1.10.10.ebuild 2237
+EBUILD catalyst-2.0.2.ebuild 2434 RMD160 cd8b9ed1e301a3b952ad298f4b6f9fec590150b3 SHA1 1c95688617cda36fd76861321fad0ab93a7ee8d5 SHA256 88548eeb38729e92b93049353d5797d126ab72c3c4999988a53a4b2ccfbe217b
+MD5 29893ee8c515c64cc2910da4e5fa9860 catalyst-2.0.2.ebuild 2434
+RMD160 cd8b9ed1e301a3b952ad298f4b6f9fec590150b3 catalyst-2.0.2.ebuild 2434
+SHA256 88548eeb38729e92b93049353d5797d126ab72c3c4999988a53a4b2ccfbe217b catalyst-2.0.2.ebuild 2434
+EBUILD catalyst-2.0.3.ebuild 2473 RMD160 818123a3a9c40f3db854026efd30139530268962 SHA1 e8330e6c1ead94c5f2c97156f565d5f5679e6761 SHA256 f30328387ef3b1641f3a0dbdaade08fad4f64456ac2f283a69f5ede54dba8b4b
+MD5 44877484837cb9435ea312ad7573a052 catalyst-2.0.3.ebuild 2473
+RMD160 818123a3a9c40f3db854026efd30139530268962 catalyst-2.0.3.ebuild 2473
+SHA256 f30328387ef3b1641f3a0dbdaade08fad4f64456ac2f283a69f5ede54dba8b4b catalyst-2.0.3.ebuild 2473
+MISC ChangeLog 36752 RMD160 80a67b8e226bef8266228fc07a2e7210f9321022 SHA1 07895b5ff90c3e62fd93fc33bebabbf15f10f74a SHA256 a7c8546b006ed11fdfd945b40686e95fa92af030da2469f4270e58c74a47441f
+MD5 f10ae782df933e792fe9617630ac85f4 ChangeLog 36752
+RMD160 80a67b8e226bef8266228fc07a2e7210f9321022 ChangeLog 36752
+SHA256 a7c8546b006ed11fdfd945b40686e95fa92af030da2469f4270e58c74a47441f ChangeLog 36752
 MISC metadata.xml 223 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 SHA1 99dbb429b3fbea01bf260400c5686461329f8f2c SHA256 df88f8a951c171af2582027db09973af5e5f0a5f578636a8f836ecea8c55cd4d
 MD5 8c971ca7e043237b69754a9d88238bd4 metadata.xml 223
 RMD160 cd1cc28ce9a44a5bcf0835859270b312c2a9c057 metadata.xml 223
@@ -36,7 +36,7 @@ SHA256 7350ee2ee526014e6853c50a63f757630f77ef3e6187a47d6258069c6b2c06bd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAYickT4lNIS36YERAnFhAKCGY5Iw+lffgjmCUo7ilQkmfrxIawCgh2y3
-fb0lHZSML8OyLCcU2JKfDNo=
-=A3Yi
+iD8DBQFGFxwL8bi6rjpTunYRAsW/AJwKwWeAYOrPnOeQ6hFnhXUUHNqbagCgpSAe
+0UKEOa1gCNItzgA5keCUBNs=
+=vCob
 -----END PGP SIGNATURE-----

diff --git a/dev-util/catalyst/catalyst-1.1.10.10.ebuild b/dev-util/catalyst/catalyst-1.1.10.10.ebuild
index 306d61a0cd48b37e6ef068a4387312b1619383c5..861a6b6f066df3f81191ee3338c19df98aaaca25 100644 (file)
--- a/dev-util/catalyst/catalyst-1.1.10.10.ebuild
+++ b/dev-util/catalyst/catalyst-1.1.10.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.10.10.ebuild,v 1.6 2007/03/05 03:25:22 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-1.1.10.10.ebuild,v 1.7 2007/04/07 04:20:04 vapier Exp $
 
 inherit eutils
 
@@ -59,11 +59,12 @@ src_install() {
        dosym /usr/lib/${PN}/catalyst /usr/bin/catalyst
        insinto /etc/catalyst
        doins files/catalyst.conf
-       if use doc;     then
-               DOCDESTTREE="." dohtml -A spec,msg,example -r examples files
-       fi
        dodoc README ChangeLog ChangeLog.old AUTHORS
        doman files/catalyst.1
+       if use doc ; then
+               insinto /usr/share/doc/${PF}/examples
+               doins examples/* || die
+       fi
 }
 
 pkg_postinst() {

diff --git a/dev-util/catalyst/catalyst-2.0.2.ebuild b/dev-util/catalyst/catalyst-2.0.2.ebuild
index 51cc0728154881d6f9b969ca88d349d4052232bc..b322b17c067a3ae284da7bc8ee08b5c93762ba51 100644 (file)
--- a/dev-util/catalyst/catalyst-2.0.2.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.2.ebuild,v 1.3 2007/03/05 03:25:22 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.2.ebuild,v 1.4 2007/04/07 04:20:04 vapier Exp $
 
 inherit eutils
 
@@ -59,7 +59,8 @@ src_install() {
        dosym /usr/lib/${PN}/catalyst /usr/bin/catalyst
        insinto /etc/catalyst
        doins files/catalyst.conf files/catalystrc || die "copying configuration"
-       DOCDESTTREE="." dohtml -A spec,msg,example -r examples files
+       insinto /usr/share/doc/${PF}/examples
+       doins examples/* || die
        dodoc README ChangeLog ChangeLog.old AUTHORS
        doman files/catalyst.1
        # Here is where we actually enable ccache

diff --git a/dev-util/catalyst/catalyst-2.0.3.ebuild b/dev-util/catalyst/catalyst-2.0.3.ebuild
index 860a7ed366d8b08f14b0d8fb776f64390fac3565..be4d45869b9fe2c50a063ead52296b615cdaf92b 100644 (file)
--- a/dev-util/catalyst/catalyst-2.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.3.ebuild,v 1.2 2007/03/21 19:33:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.3.ebuild,v 1.3 2007/04/07 04:20:04 vapier Exp $
 
 inherit eutils
 
@@ -58,7 +58,8 @@ src_install() {
        dosym /usr/lib/${PN}/catalyst /usr/bin/catalyst
        insinto /etc/catalyst
        doins files/catalyst.conf files/catalystrc || die "copying configuration"
-       DOCDESTTREE="." dohtml -A spec,msg,example -r examples files
+       insinto /usr/share/doc/${PF}/examples
+       doins examples/* || die
        dodoc README ChangeLog ChangeLog.old AUTHORS
        doman files/catalyst.1
        # Here is where we actually enable ccache