Needs dev-java/antlr[static-libs] if useflag defined, bug 368325; EAPI bump

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

3 files changed, 26 insertions, 22 deletions

diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 69495376f808..39e82e2b4951 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/fwbuilder
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.101 2011/05/15 17:25:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.102 2011/05/29 16:21:42 dilfridge Exp $
+
+  29 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  fwbuilder-3.0.7.ebuild:
+  Needs dev-java/antlr[static-libs] if useflag defined, bug 368325; EAPI bump
 
 *fwbuilder-4.2.2.3541 (15 May 2011)
 
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index 93ef9fd3a812..416e417c6e5e 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -8,26 +8,26 @@ DIST fwbuilder-3.0.7.tar.gz 2486382 RMD160 c57150a3de136add28a48fbc3b79aa1006b46
 DIST fwbuilder-4.1.2.tar.gz 5872728 RMD160 47918905e36f587194d0cfee27c5d7fd0e1c3023 SHA1 823c1e7b0947db7bd713e076bb47dd9cf816ca58 SHA256 3eae607b06bc47f85241d952c3c9bce422625aaff7ec1d632ca0fae1c977b15c
 DIST fwbuilder-4.1.3.tar.gz 5683404 RMD160 9a33fd145b45b1d126a2ef4c198c797f4661b401 SHA1 612dbfd7cd669c2ef8889157ae3f8f00d28537fe SHA256 f8af490bc3a09124eb5ac6ce1157366530cb516cf856a398b6ece819b6e6643e
 DIST fwbuilder-4.2.2.3541.tar.gz 6830864 RMD160 8c79580460d7d6a93d7c0e620e39685ac9778c0d SHA1 d497564988d4ef78b7717dc06e2227486be498ba SHA256 90111e0d7fcad31a9eccdbbc4d9ca7ce5182c0d93e8f9dbd8c683c3c80980482
-EBUILD fwbuilder-3.0.7.ebuild 1888 RMD160 218520cf2b4a6b5303079ce545152aab3c36c89d SHA1 1dc69bc20ff2d72ba359b0475d7b2b34ddf89944 SHA256 7f49b3c3f3c4c28b97446e68a10a89bddc74b63e5a4e86a5e8573cd80d1a8f11
+EBUILD fwbuilder-3.0.7.ebuild 1835 RMD160 77fea53ba44fc9d26f8f8a35ea96035cfcaad1d5 SHA1 591e62bbf5dbacf8082f47aac32296b8d3921db4 SHA256 72bc754228dbcd6b0b83048867e23cc124dd1e8829828f20ae49fb60251efa9a
 EBUILD fwbuilder-4.1.2.ebuild 1276 RMD160 fa3f31fc5bf3a0e2ac858f8d7defa24ec1d131fe SHA1 b2a719cdfd00a5eebc2ba6ec7e49b171cfedb7db SHA256 eaaa907c784d47efda46589194bcb3d58d69a7e7ca8e8bade5b1fec3e5a3c7d0
 EBUILD fwbuilder-4.1.3.ebuild 1276 RMD160 41f2e54a356e7096c38c0be1d966e067794934af SHA1 dd232702d6556036037b0a4276f0f0616784c81b SHA256 fe1091892926afdd2af7fd46a23cd98b4a4b07c81ade0063b499b4c30403f2c9
 EBUILD fwbuilder-4.2.2.3541.ebuild 1175 RMD160 77dbdcd844d891d651c44b2bdacab6d3089a45cb SHA1 b78a3fb1fd6b50011a38fb88e8ba034483e9ac50 SHA256 472bdb7945a9cdbd5c6ed19cf2b3edcd0171194dcff27010e3c3bed8534ea3bd
-MISC ChangeLog 16652 RMD160 4fecfdef7d6938ebbdc8ab55481afd90a3856e79 SHA1 36b5ba8dcff960d7f3f087e8c9a8201256461bf3 SHA256 dfb5410f31e8b2b224e879cf94ce3e5b86d0f5bbd1c3f32e65a216f6f4571a25
+MISC ChangeLog 16814 RMD160 1348fb59b06eb03ecc0822e39fc641f7a4b02d88 SHA1 3e79b7678bb2db5279947c0f37bc7ec3919a42cc SHA256 2a3639f8de89c81a8bdf7e8a841ffd5624065f9d44a777241cd1a6799fe19ed5
 MISC metadata.xml 228 RMD160 e49b64024365c32abf0972afab4491d6e7b5b678 SHA1 8481262578cdf1afa7e9054def19f0a00b328ac9 SHA256 c1d05a4723b93939d65fa0ac2fd857ab1282763036921e56e3dd49911063b218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN0BFuAAoJENwGBM22xfferSMP/2JOnonvgTeI0ckNjdecSS7i
-pBScy+n1w0+KwzaWlXEJ980SJ+DOlenfVQxXl/dMa1TNNjI0zgVg0Du22t2lh5Az
-LpqfMq/oNIjG04UKwGALez0VZMvA21m2V02reKz8Hq/ay36+2MjSurF9GewJmTAH
-NiEuO4/b1CSDLAtZHaeQ1ZCX8jf2wr9p2rZDV+2lF08h7+3swO4AitxURtY1hsd0
-STwcf16VBuDQtA0J1E5lZ5NYS6I710Wa9pVucktNpiUZpcqWec6D5rZkgkAdwsPs
-yEPJJp9Mb0XI3rHux5Nsy180/LNCQ7gAlRVsWCaAl0BCA67/4BOOJ3A/lnnbJXje
-+g6Sy5JPmfcwvTjnDcP0u4veSOfZDDcdJPnw3w8nVVHwpN7bgwmKY64oF6iAnBlT
-ANgP6xhZ/+8l2XbvLi/SCSUcd/Bw6zFVoUyMGnoC+nDVdB1KgNQGMnMDYimcGvGU
-309PKEXEHb6X2cU5DE8daA2CWiia7OXXCB7v4YSgPUfo72WNlF3Q1sWkHYvI3KLB
-Vt7HgcofnAsKVIE9ASmctDswbJ2sdf4aqYKw7BVsJlCTQ/xjfQ6TXe1hbn51fq5o
-Dg6/wX9jGqerEZilnBVwEMcuo+4bYtdfeg1ICYHPwOOK1nbX2cUyaZ3dbEk0SAV9
-W29onI8awbL7iJUbPjHc
-=AUPN
+iQIcBAEBCgAGBQJN4nKhAAoJENwGBM22xffe0/4P/jc9BuYvJxKrbR6snpLIcfjq
+wshasnywD5saBdvovHoJuk2Lh6KCLBTBm8XiSz8TYnnxDqLBalR4UBFVFZ7D9AiQ
+AwPFvaQY7ZNLNURCYxuKIjOM0QV6qgP+hHvPe4+6k3dcHeOvbM7jChG2K74JvIpf
+8j1mbVLYwR1sL5VnmLs2nQwjP+UkQqJFuHDzTdHprqTtRfXlhbZQq2brnAvSHF9W
+Uhaz+1ZFFTr8Da5BiV61uJpp58aZ6fVBFNNBhbL09RncuiH4hIYl5F4AuzbU/W6j
+xd+PzQWar0PTI3yeo7ylXA/8QksluVb9EX5nW+n4Zyw+8asCgBuy91AUUtCuVdSr
++CTZ9kghU0lbsVpi0bSdq2ilA6BctBlEbqHkg/5eFqQI1p4JAUq29MSTB11GmcGf
+wPRr9mMt2aEq7MTALEt09OEzXbiV6Vn8GqES7Sy+eE4+3wqGlQLRqfjhsKofHC2e
+d+72yGzP/x3wMrhbYxMpYoP2WzalfpuMEHcCn1LnPtH8QQjSfeqlMYBuEjnSbRSz
+uwVxkDw+Rjn5WEArgSxyKvgYXonNkKq7XcjueI6b108QGFPXtoJoXT9/e36nOxbQ
+Ay/RifRk9OdhlK+nQQ+I1kjBPfEmqYSJwf9DFM9yx+wV8CmjVUMuHPYt93t5yQAg
+8A3LeL1ie2l0/DkEbzW/
+=rGdL
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
index db4d53382f2d..a0e465dc28d3 100644
--- a/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild,v 1.6 2010/09/13 06:28:01 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-3.0.7.ebuild,v 1.7 2011/05/29 16:21:42 dilfridge Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils qt4-r2 multilib
 
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+pch"
 
 DEPEND="~net-libs/libfwbuilder-${PV}
-	>=dev-java/antlr-2.7.7:0[cxx]
+	>=dev-java/antlr-2.7.7:0[cxx,static-libs(+)]
 	x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
@@ -54,12 +54,12 @@ src_configure() {
 		--with-docdir=/usr/share/doc/${PF}
 
 	for pro_file in $(find "${S}" -name "*.pro"); do
-		eqmake4 "${pro_file}" -o "$(dirname ${pro_file})/Makefile" "CONFIG+=nostrip" || die "eqmake4 for ${pro_file} failed"
+		eqmake4 "${pro_file}" -o "$(dirname ${pro_file})/Makefile" "CONFIG+=nostrip"
 	done
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+	emake INSTALL_ROOT="${D}" install
 	cd doc
 	dodoc AUTHORS ChangeLog Credits README* \
 		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt