Add workaround for Gentoo/FreeBSD without revbump and remove ~x86-fbsd keyword from...

Package-Manager: portage-2.1.2_rc2-r4

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 555f7dcdea804fd9d4dbdf201bcd35d0d19643a5..2925699848b508ed45bb504ffeec97b9e40b3ac2 100644 (file)
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/eix
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.133 2006/12/11 10:05:27 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/ChangeLog,v 1.134 2006/12/16 14:15:24 drizzt Exp $
+
+  16 Dec 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/eix-0.8.3-fbsd.patch, eix-0.7.9.ebuild, eix-0.8.2.ebuild,
+  eix-0.8.3.ebuild:
+  Add workaround for Gentoo/FreeBSD without revbump and remove ~x86-fbsd
+  keyword from not working versions.
 
 *eix-0.8.3 (11 Dec 2006)
 

diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index bb758902a001916151cb24111a637ae1b3bc2a4a..b7d1c226f0caa626f6573f46aef091853ddfee86 100644 (file)
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX eix-0.8.3-fbsd.patch 389 RMD160 a1b73f3f7794ba3da9b30b79ff5f36b1f9556c0e SHA1 9c8d96f11cce7c038b45b9bdf887ecea7989eef1 SHA256 030ff609531fa779259db84daae42e23c28e8513d7ba7ecaaf25331a95483d16
+MD5 dc00418ec27219be1c0718367791aec5 files/eix-0.8.3-fbsd.patch 389
+RMD160 a1b73f3f7794ba3da9b30b79ff5f36b1f9556c0e files/eix-0.8.3-fbsd.patch 389
+SHA256 030ff609531fa779259db84daae42e23c28e8513d7ba7ecaaf25331a95483d16 files/eix-0.8.3-fbsd.patch 389
 DIST eix-0.6.4.tar.bz2 323718 RMD160 bb648de752a1eb4695be21900f7f49ef89e28256 SHA1 f4e8efc9688e3fd11bdc95e660bed304c897c30f SHA256 11fd39aa04fc626e5d614a4cecabbb34c653b6b53f1b92e00bb23836fbf99798
 DIST eix-0.7.9.tar.bz2 355537 RMD160 e3d0cf820808a429f6edbad1ae602778dabf6716 SHA1 d922f78ca505a2b31a62e956dd27716e1f1436bb SHA256 de852b21f779582311d896d0681d7894fd8210be919355d174650556b1987aa8
 DIST eix-0.8.2.tar.bz2 361710 RMD160 cf0cf05b48ff7dbf96dddaf1d966c3fa189ce1ae SHA1 81ad3259db95afffde6c72e40c6857274a403c7d SHA256 40ec60e57dfc2df9bf6fd1276be1edd99d00507ce728c5107a75f28f457e0844
@@ -6,22 +13,22 @@ EBUILD eix-0.6.4.ebuild 820 RMD160 0655ab43c1102e1310b2d3ff1e587ab61a38cf0e SHA1
 MD5 40a0ec75b84696bf2a4d219316a6bccd eix-0.6.4.ebuild 820
 RMD160 0655ab43c1102e1310b2d3ff1e587ab61a38cf0e eix-0.6.4.ebuild 820
 SHA256 1bf6dc6656565f9f03cfa42c002be22559b023210bb7456d69b11554b89ee31d eix-0.6.4.ebuild 820
-EBUILD eix-0.7.9.ebuild 1038 RMD160 87e669816f0407ea7616f5125b08837eebe1bad5 SHA1 473ce8e5ff559bdc76cea1e506b944dd40f5ccc8 SHA256 4a940ee96517904500832ef7080e3e4d18fbdc73df3662268e4e51646edc3ac7
-MD5 4b4e926e1dba97607edbc8b723e1af92 eix-0.7.9.ebuild 1038
-RMD160 87e669816f0407ea7616f5125b08837eebe1bad5 eix-0.7.9.ebuild 1038
-SHA256 4a940ee96517904500832ef7080e3e4d18fbdc73df3662268e4e51646edc3ac7 eix-0.7.9.ebuild 1038
-EBUILD eix-0.8.2.ebuild 1039 RMD160 ddb3835f1d320e88a508fadd3fcb0b80a5b4797e SHA1 4f4fb63bde9212c32df3bedd2891f33e6822aaa1 SHA256 fd145f886248cf059524174f378296f5fb62c810cb9a445e519ba2cf063cad53
-MD5 696b1b31010adf50671cf0522aea7213 eix-0.8.2.ebuild 1039
-RMD160 ddb3835f1d320e88a508fadd3fcb0b80a5b4797e eix-0.8.2.ebuild 1039
-SHA256 fd145f886248cf059524174f378296f5fb62c810cb9a445e519ba2cf063cad53 eix-0.8.2.ebuild 1039
-EBUILD eix-0.8.3.ebuild 1039 RMD160 4c8d5cb3744065479602961352fe572b35b02024 SHA1 53377005905950f660e9ddcec3717585bdfe27c1 SHA256 7e465323797269aca4a87227c680141fdb5ea00acb5c177c79f0d65f40755cde
-MD5 eb193cbf26ee45f4d3f93b3b6d54782d eix-0.8.3.ebuild 1039
-RMD160 4c8d5cb3744065479602961352fe572b35b02024 eix-0.8.3.ebuild 1039
-SHA256 7e465323797269aca4a87227c680141fdb5ea00acb5c177c79f0d65f40755cde eix-0.8.3.ebuild 1039
-MISC ChangeLog 16990 RMD160 7e786c41a17df336acb8c0f9577af3f547521c8b SHA1 07aa901f2f77d88637a4aa4ae9c6c50059547d94 SHA256 a5fdb57887a128f1075e4483b55937008df443c819f3e8b0166585bcf1a17b3c
-MD5 2a02cde37b2154ba04b46145c2bdff33 ChangeLog 16990
-RMD160 7e786c41a17df336acb8c0f9577af3f547521c8b ChangeLog 16990
-SHA256 a5fdb57887a128f1075e4483b55937008df443c819f3e8b0166585bcf1a17b3c ChangeLog 16990
+EBUILD eix-0.7.9.ebuild 1027 RMD160 b62ed793505ab01f0c3948266c0814163448b63b SHA1 ca7226e0cded2f8cd0b91fe3bcd00235b7f6f89c SHA256 3cea366faac67c217f4c9dcb75066d66b0f306b48001dc556be5d4d132645ce8
+MD5 ec37b3c3ae759b097a8d252ad3922137 eix-0.7.9.ebuild 1027
+RMD160 b62ed793505ab01f0c3948266c0814163448b63b eix-0.7.9.ebuild 1027
+SHA256 3cea366faac67c217f4c9dcb75066d66b0f306b48001dc556be5d4d132645ce8 eix-0.7.9.ebuild 1027
+EBUILD eix-0.8.2.ebuild 1028 RMD160 f767e369e630f3358502add48cec8e62d2c1b798 SHA1 657ff06aeae14785d19d498d459a950dc45a9916 SHA256 43e51ed3421ca63ef58c38190e455406f24f4d959febe9560052901ffb90004e
+MD5 24b206cfd3c737b01d09060ed55953c2 eix-0.8.2.ebuild 1028
+RMD160 f767e369e630f3358502add48cec8e62d2c1b798 eix-0.8.2.ebuild 1028
+SHA256 43e51ed3421ca63ef58c38190e455406f24f4d959febe9560052901ffb90004e eix-0.8.2.ebuild 1028
+EBUILD eix-0.8.3.ebuild 1135 RMD160 aaaf5426d7aa221b2277082235b453f3637d8fcc SHA1 bc009c6f5109d9bb95c74ef43a90bee30f8f3dda SHA256 2ae87820ccfe97ec0dcbbac19b77e1523002e99ddcce602b4d9a24c6e8c198dd
+MD5 bec493047eaaf53839e18736eba44303 eix-0.8.3.ebuild 1135
+RMD160 aaaf5426d7aa221b2277082235b453f3637d8fcc eix-0.8.3.ebuild 1135
+SHA256 2ae87820ccfe97ec0dcbbac19b77e1523002e99ddcce602b4d9a24c6e8c198dd eix-0.8.3.ebuild 1135
+MISC ChangeLog 17239 RMD160 6fa21886475d6371ca2c8d5790bac7d3e4341965 SHA1 0ba34527299d4aacc07b10b26bd5fd6eb1bc295e SHA256 ec46e65e63cd43150bc0c889254f812e210c4ddfb4a13c50884d60b2e4f91ca4
+MD5 61c9192d2b52e3613ecd77f784409527 ChangeLog 17239
+RMD160 6fa21886475d6371ca2c8d5790bac7d3e4341965 ChangeLog 17239
+SHA256 ec46e65e63cd43150bc0c889254f812e210c4ddfb4a13c50884d60b2e4f91ca4 ChangeLog 17239
 MISC metadata.xml 356 RMD160 41f738895266fc4e458b506d1271cf3b511839dc SHA1 ea90507084b20b9677dd2fd4140be19019f88f19 SHA256 4c50e40f01a921c65f0bf66562f1bdb623642352512cc43e7a7fa8cc0d86cabc
 MD5 24cefeb95e7034a178f381bc5cbce724 metadata.xml 356
 RMD160 41f738895266fc4e458b506d1271cf3b511839dc metadata.xml 356
@@ -38,3 +45,10 @@ SHA256 3f780b0edd4b102cc5ee7c676aca431838009b9d295e1f1d4741a2402d8280fd files/di
 MD5 8489de8cc59333ecac92c59a62adda65 files/digest-eix-0.8.3 232
 RMD160 da2bdb21f854e2892a18338dda82beefcfbd5dd7 files/digest-eix-0.8.3 232
 SHA256 528a36aa1525c411ec3c361fef75c12b588693a080ea4fc0c4153d9fe6dc8726 files/digest-eix-0.8.3 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFg/+pGDyatLGpTbYRAtHOAKCbxBmwMW9rWJeWkjhT45hnt6myWACdEKmX
+uFB0XljB1nvDTMhNVVgq+Vs=
+=SjsY
+-----END PGP SIGNATURE-----

diff --git a/app-portage/eix/eix-0.7.9.ebuild b/app-portage/eix/eix-0.7.9.ebuild
index a09138f64f15ba4e4c41454328bfc078f52b7cd8..2e6d2f0f55d063818330e0f6110a26f73ab38849 100644 (file)
--- a/app-portage/eix/eix-0.7.9.ebuild
+++ b/app-portage/eix/eix-0.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.7.9.ebuild,v 1.2 2006/12/08 19:39:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.7.9.ebuild,v 1.3 2006/12/16 14:15:24 drizzt Exp $
 
 DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
 HOMEPAGE="http://dev.croup.de/proj/eix"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="sqlite"
 
 DEPEND="sqlite? ( >=dev-db/sqlite-3 )"

diff --git a/app-portage/eix/eix-0.8.2.ebuild b/app-portage/eix/eix-0.8.2.ebuild
index 0d4ac17dbda929439b449297503a07f28d0bb577..ad4edfa578f8d02f3799b4ca37e75bb9f443a182 100644 (file)
--- a/app-portage/eix/eix-0.8.2.ebuild
+++ b/app-portage/eix/eix-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.8.2.ebuild,v 1.3 2006/12/08 19:39:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.8.2.ebuild,v 1.4 2006/12/16 14:15:24 drizzt Exp $
 
 DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
 HOMEPAGE="http://dev.croup.de/proj/eix"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/eix/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="sqlite"
 
 DEPEND="sqlite? ( >=dev-db/sqlite-3 )"

diff --git a/app-portage/eix/eix-0.8.3.ebuild b/app-portage/eix/eix-0.8.3.ebuild
index 24db2916b81dc1d2320e105246678be2d9450c1f..6a7727f2637a4c31792041f1a01e9414bf1aaaf8 100644 (file)
--- a/app-portage/eix/eix-0.8.3.ebuild
+++ b/app-portage/eix/eix-0.8.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.8.3.ebuild,v 1.1 2006/12/11 10:05:27 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.8.3.ebuild,v 1.2 2006/12/16 14:15:24 drizzt Exp $
+
+inherit eutils
 
 DESCRIPTION="Small utility for searching ebuilds with indexing for fast results"
 HOMEPAGE="http://dev.croup.de/proj/eix"
@@ -14,6 +16,13 @@ IUSE="sqlite"
 DEPEND="sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-fbsd.patch
+}
+
 src_compile() {
        econf $(use_with sqlite) || die "econf failed"
        emake || die "emake failed"

diff --git a/app-portage/eix/files/eix-0.8.3-fbsd.patch b/app-portage/eix/files/eix-0.8.3-fbsd.patch
new file mode 100644 (file)
index 0000000..07b1106
--- /dev/null
+++ b/app-portage/eix/files/eix-0.8.3-fbsd.patch
@@ -0,0 +1,14 @@
+--- src/eixTk/regexp.cc.orig 2006-12-15 22:13:38 +0100
++++ src/eixTk/regexp.cc        2006-12-16 14:51:28 +0100
+@@ -44,7 +44,11 @@
+       }
+ 
+       int errcode = regcomp(&m_re, regex, eflags|REG_EXTENDED);
++#ifdef REG_EMPTY
++      if((errcode != 0) && (errcode != REG_EMPTY)) {
++#else
+       if(errcode != 0) {
++#endif
+               fprintf(stderr, "regcomp(\"%s\"): %s\n", regex, get_error(errcode).c_str());
+               exit(1);
+       }