fix bug 104083
authorBenedikt Boehm <hollow@gentoo.org>
Mon, 29 Aug 2005 19:52:46 +0000 (19:52 +0000)
committerBenedikt Boehm <hollow@gentoo.org>
Mon, 29 Aug 2005 19:52:46 +0000 (19:52 +0000)
Package-Manager: portage-2.0.51.22-r2

app-portage/eix/ChangeLog
app-portage/eix/Manifest
app-portage/eix/eix-0.3.0.ebuild
app-portage/eix/files/0.3.0-datatype-mix.patch [new file with mode: 0644]

index ec7f9e6fce9e9fa8686080e3c039035eedb25e87..287bc448914d68364004234f31236d2e4108abc6 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.38 2005/08/27 22:32:26 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.39 2005/08/29 19:52:46 hollow Exp $
+
+  29 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/0.3.0-datatype-mix.patch, eix-0.3.0.ebuild:
+  fix bug 104083
 
 *eix-0.3.0 (27 Aug 2005)
 
index 8aecbca07b38b79a2cd102610dfe107692dce5e7..dfe59ed990234c36a192da29c27ef31af5967314 100644 (file)
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1312d65760f4b7fc706ef9bf6f49ba41 ChangeLog 5033
+MD5 9c5308dbda5fe62f96abe0d53b74a55a ChangeLog 5154
 MD5 68a279a35a3f34c3c9562ad4509938db eix-0.2.1.ebuild 916
 MD5 49642086df408e27d9c50e8759b6f8e3 eix-0.2.2.ebuild 1152
 MD5 74c5aadf8e3e9d642a20e64d1afefec8 metadata.xml 239
 MD5 3ddb302ff870c03e4c516e07298417e2 eix-0.2.6.ebuild 1303
 MD5 85087764ba2c23688b9cc5399ec65fc7 eix-0.3.0_beta.ebuild 1082
-MD5 08b1dd0ab38e76c19029a9dd78cdd856 eix-0.3.0.ebuild 1184
+MD5 bea626864c451169e0eb7d03dfea29c5 eix-0.3.0.ebuild 1270
 MD5 b012df8992488da6f22e677cba2e1f9c files/0.2.2-incorrect-masks.patch 1661
 MD5 9033adc2410fa5477618aa28ae6d8582 files/0.2.2-unistd.h.patch 716
 MD5 3a36ef63cff165b67afeb774a7edf9d1 files/0.2.6-package.cc.patch 461
 MD5 1df3eabe7a20b27cf2d3c1c0b2b5a090 files/0.2.6-cdb-cast.patch 516
 MD5 451cd103e930d34810d0c426b7ad0ddb files/0.3.0-if-else-fi.patch 635
+MD5 309a6ba7043e7941a8effc552ec3a1a0 files/0.3.0-datatype-mix.patch 2066
 MD5 943e6938455bf034be166ecbe03c88aa files/digest-eix-0.2.1 62
 MD5 3eff250e62af117080bac27f4f2a9655 files/digest-eix-0.2.2 62
 MD5 79cb9eb15d5c16732f94bf126ee8ca2f files/digest-eix-0.2.6 62
@@ -21,7 +22,7 @@ MD5 462758982cd4c3d424f0f84313959993 files/digest-eix-0.3.0_beta 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDEOoPmPFBzbX68WERAvsmAJ9hu4EUOSfU9JXyeB35DpGsgPRe2ACcCwmO
-qpWNW+m8HDmXVh0j8hYG3Os=
-=0lau
+iD8DBQFDE2e0mPFBzbX68WERAs0+AJ9O+0qtIlrQreuKUuX9iSSWEr9PcACeOryp
+lh66L+e6pH83A0BCrwgL0jQ=
+=CT7p
 -----END PGP SIGNATURE-----
index 02ad4274ed1556822bd743832b98691816e33429..2f380e5e3df06c34aa0aa8d2d799ee802b586eab 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0.ebuild,v 1.1 2005/08/27 22:32:26 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.3.0.ebuild,v 1.2 2005/08/29 19:52:46 hollow Exp $
 
 inherit eutils flag-o-matic bash-completion
 
@@ -19,7 +19,8 @@ src_unpack() {
        unpack ${A}
        cd ${S}
 
-       epatch ${FILESDIR}/0.3.0-if-else-fi.patch || die "epatch failed"
+       epatch ${FILESDIR}/0.3.0-if-else-fi.patch || die "if-else-fi patch failed"
+       epatch ${FILESDIR}/0.3.0-datatype-mix.patch || die "datatype patch failed"
 }
 
 src_compile() {
diff --git a/app-portage/eix/files/0.3.0-datatype-mix.patch b/app-portage/eix/files/0.3.0-datatype-mix.patch
new file mode 100644 (file)
index 0000000..625d414
--- /dev/null
@@ -0,0 +1,64 @@
+--- eix-0.3.0/src/databaseTk/packagedatabase.h.orig    2005-08-29 13:15:31.000000000 +0200
++++ eix-0.3.0/src/databaseTk/packagedatabase.h 2005-08-29 13:15:39.000000000 +0200
+@@ -33,6 +33,23 @@
+ #include <databaseTk/basicio.h>
+ #include <map>
+ 
++class CategoryHeader {
++      public:
++              typedef unsigned int size_type;
++
++              static size_type read(FILE *stream, string &name) {
++                      size_type ret;
++                      DB_READ_STRING(stream,  name);
++                      DB_READ_GENERIC(stream, ret, size_type);
++                      return ret;
++              }
++
++              static void write(FILE *stream, const string &name, const size_type size) {
++                      DB_WRITE_STRING(stream,  name);
++                      DB_WRITE_GENERIC(stream, size, size_type);
++              }
++};
++
+ /** Body of a database. */
+ class PackageDatabase {
+ 
+@@ -136,8 +153,11 @@
+                       for(mapiter c = _packages.begin(); c != _packages.end(); ++c) {
+                               /* Write category-header followed by a list of the packages. */
+                               vector<Package>::size_type s = c->second.size();
++                              CategoryHeader::write(stream, c->first, s);
++#if 0
+                               DB_WRITE_STRING(stream,  c->first);
+                               DB_WRITE_GENERIC(stream, s, vector<Package>::size_type);
++#endif
+                               for(pkgiter p = c->second.begin(); p != c->second.end(); ++p) {
+                                       /* write package to stream */
+                                       (*p)->write(stream);
+@@ -151,8 +171,11 @@
+                       string                      name;
+ 
+                       for(unsigned int i = 0; i < header->numcategories; i++) {
++                              size = CategoryHeader::read(stream, name);
++#if 0
+                               DB_READ_STRING(stream,  name);
+                               DB_READ_GENERIC(stream, size, vector<Package>::size_type);
++#endif
+                               for(unsigned int i = 0; i<size; i++) {
+                                       fseeko(stream, sizeof(Package::offset_type) , SEEK_CUR);
+                                       Package *pkg = new Package(stream);
+--- eix-0.3.0/src/databaseTk/dbselector.cc.orig        2005-08-29 13:15:23.000000000 +0200
++++ eix-0.3.0/src/databaseTk/dbselector.cc     2005-08-29 13:15:48.000000000 +0200
+@@ -37,8 +37,11 @@
+               if(_cats-- == 0) {
+                       return NULL;
+               }
++              _pkgs = CategoryHeader::read(_input, _catname);
++#if 0
+               DB_READ_STRING(_input,  _catname);
+               DB_READ_GENERIC(_input, _pkgs, unsigned int);
++#endif
+               return next();
+       }
+