Revision bump; added patch that fixes the storing of locale-specific <longdescription>'s.

(Portage version: 2.0.53_rc7)

5 files changed, 60 insertions, 16 deletions

diff --git a/dev-cpp/libherdstat/ChangeLog b/dev-cpp/libherdstat/ChangeLog
index 9931b21d2d6f..3fb08fb9b701 100644
--- a/dev-cpp/libherdstat/ChangeLog
+++ b/dev-cpp/libherdstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-cpp/libherdstat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.6 2005/11/02 15:07:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.7 2005/11/06 02:37:37 ka0ttic Exp $
+
+*libherdstat-0.1.1-r1 (06 Nov 2005)
+
+  06 Nov 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/libherdstat-0.1.1-fix-locale-longdesc.diff,
+  -libherdstat-0.1.1.ebuild, +libherdstat-0.1.1-r1.ebuild:
+  Revision bump; added patch that fixes the storing of locale-specific
+  <longdescription>'s.
 
 *libherdstat-0.1.1 (02 Nov 2005)
 
diff --git a/dev-cpp/libherdstat/Manifest b/dev-cpp/libherdstat/Manifest
index 68d5d5e7ee05..1a2d980b3e48 100644
--- a/dev-cpp/libherdstat/Manifest
+++ b/dev-cpp/libherdstat/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e97f8b506015ebcf7e333f18bcbd01b8 ChangeLog 1177
-MD5 426d70038fbc094b415cebdcb81c8899 files/digest-libherdstat-0.1.1 149
-MD5 a821486d0e6ddddfb74f1b814c3dfcf0 libherdstat-0.1.1.ebuild 1449
+MD5 b555d9f6b19dd0022291f185162f2206 ChangeLog 1470
+MD5 a3cecf0f7119076f8c554c5af35248e4 files/digest-libherdstat-0.1.1-r1 149
+MD5 80fdc6c488a033e2c621c5204433aabf files/libherdstat-0.1.1-fix-locale-longdesc.diff 1411
+MD5 53f5dba39fd367100b5f6a3962b87185 libherdstat-0.1.1-r1.ebuild 1555
 MD5 b0b19a2ad7f5b88f52f6698b5b5083bf metadata.xml 593
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDaNYxEZCkKN40op4RAov7AJ9ybZE+QdQ3h2KbIAPEFvg9AxyJMgCfdeMZ
-mVD70WVmp2TYqHpS1kTu748=
-=Z+og
------END PGP SIGNATURE-----
diff --git a/dev-cpp/libherdstat/files/digest-libherdstat-0.1.1 b/dev-cpp/libherdstat/files/digest-libherdstat-0.1.1-r1
index 3c26a0e641dd..3b68e32df935 100644
--- a/dev-cpp/libherdstat/files/digest-libherdstat-0.1.1
+++ b/dev-cpp/libherdstat/files/digest-libherdstat-0.1.1-r1
@@ -1,2 +1,2 @@
 MD5 85b9fd986d1e7cca7e114c1b3d1384a9 herdstat-test-data-20051023.tar.bz2 15901
-MD5 1f496fad871a87fe1cde3080228d7559 libherdstat-0.1.1.tar.bz2 303836
+MD5 ab9074ac06341d3b0dc15ad556147457 libherdstat-0.1.1.tar.bz2 299408
diff --git a/dev-cpp/libherdstat/files/libherdstat-0.1.1-fix-locale-longdesc.diff b/dev-cpp/libherdstat/files/libherdstat-0.1.1-fix-locale-longdesc.diff
new file mode 100644
index 000000000000..1832686ee591
--- /dev/null
+++ b/dev-cpp/libherdstat/files/libherdstat-0.1.1-fix-locale-longdesc.diff
@@ -0,0 +1,37 @@
+Index: herdstat/portage/metadata_xml.cc
+===================================================================
+--- herdstat/portage/metadata_xml.cc	(revision 102)
++++ herdstat/portage/metadata_xml.cc	(revision 103)
+@@ -57,6 +57,9 @@
+     if (not path.empty()) this->set_path(path);
+     if (not util::file_exists(this->path())) throw FileException(this->path());
+     this->parse_file(this->path().c_str());
++
++    if (_data.longdesc().empty() and not _longdesc.empty())
++        _data.set_longdesc(_longdesc);
+ }
+ /****************************************************************************/
+ bool
+@@ -127,7 +130,9 @@
+         const_cast<Developer&>(*_cur_dev).set_name(_cur_dev->name() + text);
+     else if (in_desc)
+         const_cast<Developer&>(*_cur_dev).set_role(text);
+-    else if (in_en_longdesc or in_longdesc)
++    else if (in_en_longdesc)
++        _longdesc += text;
++    else if (in_longdesc)
+         _data.set_longdesc(_data.longdesc() + text);
+     return true;
+ }
+Index: herdstat/portage/metadata_xml.hh
+===================================================================
+--- herdstat/portage/metadata_xml.hh	(revision 102)
++++ herdstat/portage/metadata_xml.hh	(revision 103)
+@@ -96,6 +96,7 @@
+                  in_en_longdesc;
+ 
+             Developers::iterator _cur_dev;
++            std::string _longdesc;
+     };
+ 
+     inline const metadata& metadata_xml::data() const { return _data; }
diff --git a/dev-cpp/libherdstat/libherdstat-0.1.1.ebuild b/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild
index e3a21f290292..eca33fbf38c2 100644
--- a/dev-cpp/libherdstat/libherdstat-0.1.1.ebuild
+++ b/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.1.1.ebuild,v 1.1 2005/11/02 15:07:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild,v 1.1 2005/11/06 02:37:37 ka0ttic Exp $
+
+inherit eutils
 
 TEST_DATA_PV="20051023"
 TEST_DATA_P="${PN/lib/}-test-data-${TEST_DATA_PV}"
@@ -24,6 +26,12 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	!curl? ( net-misc/wget )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-locale-longdesc.diff
+}
+
 src_compile() {
 	econf \
 		--with-test-data=${WORKDIR}/${TEST_DATA_P} \