fix herds.xml location

Package-Manager: portage-2.1.2-r9

diff --git a/app-portage/herdstat/ChangeLog b/app-portage/herdstat/ChangeLog
index 93c7436de0ee299ac7c452006f4e80f6859f21f2..b8bbea23e65e2fc2b64668b0dd25023259c5a94f 100644 (file)
--- a/app-portage/herdstat/ChangeLog
+++ b/app-portage/herdstat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/herdstat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.74 2007/02/10 19:39:01 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.75 2007/02/12 05:01:25 compnerd Exp $
+
+*herdstat-1.1.91-r1 (12 Feb 2007)
+
+  12 Feb 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/herds-xml-location-update.patch, -herdstat-1.1.91.ebuild,
+  +herdstat-1.1.91-r1.ebuild:
+  Apply a patch for the updated location of herds.xml
 
   10 Feb 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   herdstat-1.1.91.ebuild:

diff --git a/app-portage/herdstat/Manifest b/app-portage/herdstat/Manifest
index 24fbc0b529f56f26d4506acbe24b110425a3f28b..f05486c514b90368d6421b029826335536cbb7f2 100644 (file)
--- a/app-portage/herdstat/Manifest
+++ b/app-portage/herdstat/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX herds-xml-location-update.patch 539 RMD160 82e32bae9064790ba933100a74243e9ff3929c61 SHA1 a6d246514ea46c7cf3c9f623536eeca77a1af4a6 SHA256 63ecb7e25a17bf30e131a73dfbecd994730623d599016ae564802fac8da66f95
+MD5 52448838b5fdfde9747921de3b7c50f1 files/herds-xml-location-update.patch 539
+RMD160 82e32bae9064790ba933100a74243e9ff3929c61 files/herds-xml-location-update.patch 539
+SHA256 63ecb7e25a17bf30e131a73dfbecd994730623d599016ae564802fac8da66f95 files/herds-xml-location-update.patch 539
 AUX herdstat-1.1.91-undefined-lhp.patch 619 RMD160 0d4437f391e781df3a1b8e3d617cf7c9efbc0fe2 SHA1 659fda1a3a35cdc0b651943c0a11ebee0fb15dae SHA256 a65617822f25d1cbfd90af3bdf914673300b404c4341e9c162e46a162f852b93
 MD5 3af990064ad2846a7e30f0c6475e596d files/herdstat-1.1.91-undefined-lhp.patch 619
 RMD160 0d4437f391e781df3a1b8e3d617cf7c9efbc0fe2 files/herdstat-1.1.91-undefined-lhp.patch 619
@@ -18,14 +19,14 @@ EBUILD herdstat-1.1.2.ebuild 2077 RMD160 d0401389448acb56bd2c705647ec7be95444514
 MD5 ae8ca64eb3763687fefd8dbc7bee28d0 herdstat-1.1.2.ebuild 2077
 RMD160 d0401389448acb56bd2c705647ec7be954445143 herdstat-1.1.2.ebuild 2077
 SHA256 bbd4746436a00c9772939749f81ad41b4a699d08244a5352be7d635cb917db66 herdstat-1.1.2.ebuild 2077
-EBUILD herdstat-1.1.91.ebuild 2676 RMD160 f6c15c3e62c8f5542403fee9180545b6705b7226 SHA1 d63be58d81b9350751b7677858caa01a3cb1ecf5 SHA256 01e60be5543cc5d7bf67a19357fa1d6e49bdd0c92974b12d6897b9762b6f6de8
-MD5 71a72757b4afdd5fc124186510e4b433 herdstat-1.1.91.ebuild 2676
-RMD160 f6c15c3e62c8f5542403fee9180545b6705b7226 herdstat-1.1.91.ebuild 2676
-SHA256 01e60be5543cc5d7bf67a19357fa1d6e49bdd0c92974b12d6897b9762b6f6de8 herdstat-1.1.91.ebuild 2676
-MISC ChangeLog 10948 RMD160 12eaf0186124194da29bf6d997e7f2b7118df46e SHA1 18ff85dad56f0f68a3639aac24ef52fe6772bc32 SHA256 14614d08d5e7113ddd5672efd1842610eb760c0849dd6222c37a03b623f540f5
-MD5 9260c50b0cab1552e00ddb311449776d ChangeLog 10948
-RMD160 12eaf0186124194da29bf6d997e7f2b7118df46e ChangeLog 10948
-SHA256 14614d08d5e7113ddd5672efd1842610eb760c0849dd6222c37a03b623f540f5 ChangeLog 10948
+EBUILD herdstat-1.1.91-r1.ebuild 2739 RMD160 ae7efbf604e2fdb96be3b75d7da6f1088154d195 SHA1 fd86572ed7bd74721c2c2f1b178a5ef35af3fe8d SHA256 6e3b21c3f5d785c7f2a5d6a1bb7616145530e89d075cd7dc4aa8500db6eca5d0
+MD5 a13d34f38c711fdfb3a154914e3026ea herdstat-1.1.91-r1.ebuild 2739
+RMD160 ae7efbf604e2fdb96be3b75d7da6f1088154d195 herdstat-1.1.91-r1.ebuild 2739
+SHA256 6e3b21c3f5d785c7f2a5d6a1bb7616145530e89d075cd7dc4aa8500db6eca5d0 herdstat-1.1.91-r1.ebuild 2739
+MISC ChangeLog 11191 RMD160 655a1010415ba20dfbd9a42c0c55f4489a8834fe SHA1 274a521e8e1dc11078259ea5a086194da7f8167c SHA256 a98c71eccc5b0c5671b3c503ac54a672fbad5bc7348a913498d0d42282f864ef
+MD5 d55dfadf1f36a70fd9834f78aba59611 ChangeLog 11191
+RMD160 655a1010415ba20dfbd9a42c0c55f4489a8834fe ChangeLog 11191
+SHA256 a98c71eccc5b0c5671b3c503ac54a672fbad5bc7348a913498d0d42282f864ef ChangeLog 11191
 MISC metadata.xml 354 RMD160 8e3a810f2a40bd1c14f5d9dbd91460ac886aefe8 SHA1 5df5ec063152bffbd38a8c33e05ee9ff3fb57488 SHA256 b30779e2edc1d51205813c3ae87e042eb0e9bcf48aba14ecfa610db944bed8e7
 MD5 502eaa3b3cc3becea50c712ef3793d68 metadata.xml 354
 RMD160 8e3a810f2a40bd1c14f5d9dbd91460ac886aefe8 metadata.xml 354
@@ -36,13 +37,6 @@ SHA256 d075260649cd37b3ceaa8aa125559df674de4b40c0d19d129253a88de5454802 files/di
 MD5 51a960ad1e3892e57279fdb6df1874de files/digest-herdstat-1.1.2 530
 RMD160 5116694b441a37eeaa1cdfaa69db7b9a342ade20 files/digest-herdstat-1.1.2 530
 SHA256 69140a88dbe35066ce25aee16e876293f06117e1e802f23d8901c44b33b186d9 files/digest-herdstat-1.1.2 530
-MD5 cdd47ccfe3ae888c5cda0da607c46a0c files/digest-herdstat-1.1.91 533
-RMD160 fa50f02dc1cce3fc2e66c3daf2c5a5662d2a39aa files/digest-herdstat-1.1.91 533
-SHA256 1529910d87d008a5ad9a8b6036f7d5d196e257025120c7e44ddd2c5018fec334 files/digest-herdstat-1.1.91 533
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzxai8bi6rjpTunYRAgORAKCyZM1IQytjKyMDKTrhLGrZUUN39wCglfDP
-JOqoIMyd3AkRT3UCPTnib08=
-=I1tS
------END PGP SIGNATURE-----
+MD5 cdd47ccfe3ae888c5cda0da607c46a0c files/digest-herdstat-1.1.91-r1 533
+RMD160 fa50f02dc1cce3fc2e66c3daf2c5a5662d2a39aa files/digest-herdstat-1.1.91-r1 533
+SHA256 1529910d87d008a5ad9a8b6036f7d5d196e257025120c7e44ddd2c5018fec334 files/digest-herdstat-1.1.91-r1 533

diff --git a/app-portage/herdstat/files/digest-herdstat-1.1.91 b/app-portage/herdstat/files/digest-herdstat-1.1.91-r1
similarity index 100%
rename from app-portage/herdstat/files/digest-herdstat-1.1.91
rename to app-portage/herdstat/files/digest-herdstat-1.1.91-r1

diff --git a/app-portage/herdstat/files/herds-xml-location-update.patch b/app-portage/herdstat/files/herds-xml-location-update.patch
new file mode 100644 (file)
index 0000000..71d3f5e
--- /dev/null
+++ b/app-portage/herdstat/files/herds-xml-location-update.patch
@@ -0,0 +1,11 @@
+--- src/herdstat.cc.orig       2007-02-11 22:56:25.000000000 -0600
++++ src/herdstat.cc    2007-02-11 22:58:30.000000000 -0600
+@@ -632,7 +632,7 @@
+ 
+           /* only set if it wasnt specified on the command line */
+           if (options.herdsxml().empty())
+-              options.set_herdsxml(gentoocvs+"/gentoo/misc/herds.xml");
++              options.set_herdsxml(gentoocvs+"/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml");
+           if (options.userinfoxml().empty())
+               options.set_userinfoxml(gentoocvs+"/gentoo/xml/htdocs/proj/en/devrel/roll-call/userinfo.xml");
+       }

diff --git a/app-portage/herdstat/herdstat-1.1.91.ebuild b/app-portage/herdstat/herdstat-1.1.91-r1.ebuild
similarity index 91%
rename from app-portage/herdstat/herdstat-1.1.91.ebuild
rename to app-portage/herdstat/herdstat-1.1.91-r1.ebuild
index 8976f9efbe94e2905a33eb93fa015e573554a0af..b3c349c96ac9790163394a9723963278f2315be0 100644 (file)
--- a/app-portage/herdstat/herdstat-1.1.91.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.91-r1.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/app-portage/herdstat/herdstat-1.1.91.ebuild,v 1.5 2007/02/11 13:13:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.91-r1.ebuild,v 1.1 2007/02/12 05:01:25 compnerd Exp $
 
 inherit bash-completion eutils
 
@@ -18,11 +18,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="debug doc readline test"
 
 RDEPEND=">=dev-cpp/libherdstat-0.2.0
-       readline? ( sys-libs/readline )"
+                readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}
-       >=sys-apps/sed-4
-       dev-util/pkgconfig
-       doc? ( dev-python/docutils )"
+               >=sys-apps/sed-4
+               dev-util/pkgconfig
+               doc? ( dev-python/docutils )"
 
 pkg_setup() {
        if has test $FEATURES && ! use test ; then
@@ -37,6 +37,8 @@ src_unpack() {
        if ! use readline ; then
                epatch ${FILESDIR}/${PN}-1.1.91-undefined-lhp.patch
        fi
+
+       epatch ${FILESDIR}/herds-xml-location-update.patch
 }
 
 src_compile() {