sparc/x86 stable, version bump wrt bug #197274

Package-Manager: portage-2.1.3.16

6 files changed, 37 insertions, 28 deletions

diff --git a/net-misc/ferm/ChangeLog b/net-misc/ferm/ChangeLog
index 27eb019ec9fc..82b430b38fc8 100644
--- a/net-misc/ferm/ChangeLog
+++ b/net-misc/ferm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ferm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ChangeLog,v 1.16 2007/09/20 18:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ChangeLog,v 1.17 2007/10/29 15:09:55 armin76 Exp $
+
+*ferm-1.2.5 (29 Oct 2007)
+
+  29 Oct 2007; Raúl Porcel <armin76@gentoo.org> -ferm-1.2.ebuild,
+  ferm-1.2.4.ebuild, +ferm-1.2.5.ebuild:
+  sparc/x86 stable, version bump wrt bug #197274
 
 *ferm-1.2.4 (20 Sep 2007)
 
diff --git a/net-misc/ferm/Manifest b/net-misc/ferm/Manifest
index 46679f50b284..74c51771a880 100644
--- a/net-misc/ferm/Manifest
+++ b/net-misc/ferm/Manifest
@@ -1,22 +1,22 @@
 DIST ferm-1.1.tar.gz 81503 RMD160 62eaa1015e9219e7c55bd6023dcfefc3dcf009c8 SHA1 5bc7b1c3ab0f1a36d7ddd9b6a967c04c5bb60c83 SHA256 9665ff30729d79349d0a068727f4f02136a0e2e56fab1ec336e487f346eaf4bb
 DIST ferm-1.2.4.tar.gz 101769 RMD160 7a50e027ceea3866a0ce6c8b02cd1326a0c1c653 SHA1 5d89969c9b3053c5341a6f30d316b4d60bd5d25e SHA256 a8ea7270fbfda874246ce71d2b0b8a22848d129108eaeaed698c632ba3cd370c
-DIST ferm-1.2.tar.gz 89902 RMD160 aa95dbfcef2da23c83fc9f2e7538ccc80cf1f4e6 SHA1 e3eed6ad8df2b37645c92476522a51d3f5d0bc74 SHA256 e627b46e9f8878ecf3f6767f4385e8611f64e1ac8bdef4fa61cc3b8a6d89fc61
+DIST ferm-1.2.5.tar.gz 101878 RMD160 5615f4ce4fe16a3b0aeabc1913b37935274bf97f SHA1 37ac5773e9d6b13a84a94265f09e2762669d4525 SHA256 d62fbc0185844de0acd0ee5e77a58e9e2e243831dc21e584d2228874f846a47c
 EBUILD ferm-1.1.ebuild 682 RMD160 e72cb40e9117bc61e43423d331bacbf86bbd3103 SHA1 9fb7964be61f30d2e57ce262285715fa23cf543c SHA256 e7ab1829d57a855be41b5c9c02ff8f33814162c23c68be24db61663f0f71149b
 MD5 02895495caf24121cab0cce026656605 ferm-1.1.ebuild 682
 RMD160 e72cb40e9117bc61e43423d331bacbf86bbd3103 ferm-1.1.ebuild 682
 SHA256 e7ab1829d57a855be41b5c9c02ff8f33814162c23c68be24db61663f0f71149b ferm-1.1.ebuild 682
-EBUILD ferm-1.2.4.ebuild 793 RMD160 c7b6e53ea48041e07a36f3c493ab5e806e4d5298 SHA1 33bddd66107903e6a53ef5553f77b0d6b6d71b93 SHA256 5feea012619ce51a6c6fd5ca97b79ca722d2aacb6343c92c71182f5d0b059470
-MD5 4a66fca510131bc5d403d927263b87a0 ferm-1.2.4.ebuild 793
-RMD160 c7b6e53ea48041e07a36f3c493ab5e806e4d5298 ferm-1.2.4.ebuild 793
-SHA256 5feea012619ce51a6c6fd5ca97b79ca722d2aacb6343c92c71182f5d0b059470 ferm-1.2.4.ebuild 793
-EBUILD ferm-1.2.ebuild 724 RMD160 1ef818a030a4cc4add2fdc2666f5993a8e759f90 SHA1 99cda03153b266723de7aa168e35103abf202d80 SHA256 3df63f98c4e4f29560419251a46920dfd30664fed2a01c74e8d9f12aa75e530d
-MD5 adb65aba02f6614e509f3faf17e8f244 ferm-1.2.ebuild 724
-RMD160 1ef818a030a4cc4add2fdc2666f5993a8e759f90 ferm-1.2.ebuild 724
-SHA256 3df63f98c4e4f29560419251a46920dfd30664fed2a01c74e8d9f12aa75e530d ferm-1.2.ebuild 724
-MISC ChangeLog 1419 RMD160 d4323c6c10068563a4321949f6bc2304c08a5ba7 SHA1 0fb9a0ba660c310bc01be08c483bc54f65d3fdaf SHA256 5a1537d99ea90e8b79bf9f7d853905590e2bb1febadbb4d0ef6a540f7fa14f73
-MD5 cb4d5d9fdc7da513a6ea5f67ba8b39fc ChangeLog 1419
-RMD160 d4323c6c10068563a4321949f6bc2304c08a5ba7 ChangeLog 1419
-SHA256 5a1537d99ea90e8b79bf9f7d853905590e2bb1febadbb4d0ef6a540f7fa14f73 ChangeLog 1419
+EBUILD ferm-1.2.4.ebuild 766 RMD160 8b53989bfa6e7093e6f11776d9ae6fdce7a07254 SHA1 1dbc88d29042db5fc4f869f6e07f52556b616b98 SHA256 64d71e3624243c4fe67224a089b14ca1e9aaf8d1b25e0e3cf31f6f712d4902a5
+MD5 f2dced6c1a3c2dd39b6ccd098aa67c81 ferm-1.2.4.ebuild 766
+RMD160 8b53989bfa6e7093e6f11776d9ae6fdce7a07254 ferm-1.2.4.ebuild 766
+SHA256 64d71e3624243c4fe67224a089b14ca1e9aaf8d1b25e0e3cf31f6f712d4902a5 ferm-1.2.4.ebuild 766
+EBUILD ferm-1.2.5.ebuild 768 RMD160 6628242038c29f975350499da2b7d30554240f0e SHA1 f411597cc1070d7a70c74a84057965020b36f562 SHA256 b9897164420722e28135df6e108d0ac0886ed56d3e93d033c31b23a5ea9b0fd4
+MD5 a693e9f95dbb534434a7b39939af4ca5 ferm-1.2.5.ebuild 768
+RMD160 6628242038c29f975350499da2b7d30554240f0e ferm-1.2.5.ebuild 768
+SHA256 b9897164420722e28135df6e108d0ac0886ed56d3e93d033c31b23a5ea9b0fd4 ferm-1.2.5.ebuild 768
+MISC ChangeLog 1604 RMD160 763b8b44cfa392ad9071a6e9aa1f40b83fae2f48 SHA1 4793648d4160fdbabde97df304c18df1079b120e SHA256 16e2a99ac71f5f7d208bded1bf3a1fd80a0ac1282499f788ac96cf9e202670d8
+MD5 150067ecef3d49b3848c98aa169239e9 ChangeLog 1604
+RMD160 763b8b44cfa392ad9071a6e9aa1f40b83fae2f48 ChangeLog 1604
+SHA256 16e2a99ac71f5f7d208bded1bf3a1fd80a0ac1282499f788ac96cf9e202670d8 ChangeLog 1604
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -24,9 +24,9 @@ SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata
 MD5 989064d4c7790e8032ae8eddf2bb98fc files/digest-ferm-1.1 223
 RMD160 fcc4345063b23b18e7b9027e358dc84e5da97a55 files/digest-ferm-1.1 223
 SHA256 fb176df3da4b306fe4c5590a4f83c49414b5063355b0856799ea3d7ae884bd05 files/digest-ferm-1.1 223
-MD5 2ce8f9b724f07c7455ae0c7deb49f8f2 files/digest-ferm-1.2 223
-RMD160 b50fe429e71ae29ffdf2b6a267d7a77613faaa68 files/digest-ferm-1.2 223
-SHA256 97500e39ed464c35f6b3c20b072f0f33a559cf3e29bbf8cb47e298975517ccf9 files/digest-ferm-1.2 223
 MD5 76ac18248ddd64469e0422337faf23e1 files/digest-ferm-1.2.4 232
 RMD160 b9e2d6a3b3757b95e7dd39231c4e0e5a68e70249 files/digest-ferm-1.2.4 232
 SHA256 08561a98a8c06e5d25b3435e85af0f12971d7dcea3e0812b6c5027e07080b69c files/digest-ferm-1.2.4 232
+MD5 5ff0cc2f800092183db2abd339a584e1 files/digest-ferm-1.2.5 232
+RMD160 3fe8f940bb3fe54ada06c5321d60ca6b50795a8a files/digest-ferm-1.2.5 232
+SHA256 8dbba72c5ae633f9e28d16ebfdb22f1ac226d1ae76717e4a55c17a0d64d59859 files/digest-ferm-1.2.5 232
diff --git a/net-misc/ferm/ferm-1.2.4.ebuild b/net-misc/ferm/ferm-1.2.4.ebuild
index c67b0e5a2758..ac866d9b2f4d 100644
--- a/net-misc/ferm/ferm-1.2.4.ebuild
+++ b/net-misc/ferm/ferm-1.2.4.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/net-misc/ferm/ferm-1.2.4.ebuild,v 1.1 2007/09/20 18:10:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ferm-1.2.4.ebuild,v 1.2 2007/10/29 15:09:55 armin76 Exp $
 
 inherit versionator
 
@@ -10,16 +10,16 @@ HOMEPAGE="http://ferm.foo-projects.org/"
 SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc sparc x86"
 IUSE=""
 SLOT="0"
 
 DEPEND=""
 RDEPEND="dev-lang/perl
-	|| ( net-firewall/iptables net-firewall/ipchains )"
+	net-firewall/iptables"
 
 src_install () {
-	make PREFIX=${D}/usr DOCDIR="${D}/usr/share/doc/${PF}" install || die 'make	install failed'
+	emake PREFIX="${D}/usr" DOCDIR="${D}/usr/share/doc/${PF}" install || die "emake install failed"
 }
 
 pkg_postinst() {
diff --git a/net-misc/ferm/ferm-1.2.ebuild b/net-misc/ferm/ferm-1.2.5.ebuild
index 69b40a8dfbb9..b7fa4c82f699 100644
--- a/net-misc/ferm/ferm-1.2.ebuild
+++ b/net-misc/ferm/ferm-1.2.5.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ferm-1.2.ebuild,v 1.1 2007/01/02 19:29:19 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ferm/ferm-1.2.5.ebuild,v 1.1 2007/10/29 15:09:55 armin76 Exp $
 
+inherit versionator
+
+MY_PV="$(get_version_component_range 1-2)"
 DESCRIPTION="Command line util for managing firewall rules"
 HOMEPAGE="http://ferm.foo-projects.org/"
-SRC_URI="http://ferm.foo-projects.org/download/${P}.tar.gz"
+SRC_URI="http://ferm.foo-projects.org/download/${MY_PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc ~x86"
@@ -13,10 +16,10 @@ SLOT="0"
 
 DEPEND=""
 RDEPEND="dev-lang/perl
-	|| ( net-firewall/iptables net-firewall/ipchains )"
+	net-firewall/iptables"
 
 src_install () {
-	make PREFIX=${D}/usr DOCDIR="${D}/usr/share/doc/${PF}" install || die 'make	install failed'
+	emake PREFIX="${D}/usr" DOCDIR="${D}/usr/share/doc/${PF}" install || die "emake install failed"
 }
 
 pkg_postinst() {
diff --git a/net-misc/ferm/files/digest-ferm-1.2 b/net-misc/ferm/files/digest-ferm-1.2
deleted file mode 100644
index 7843ff4d0630..000000000000
--- a/net-misc/ferm/files/digest-ferm-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 53b7814334a4bca4b4c9f83ebc74d3e8 ferm-1.2.tar.gz 89902
-RMD160 aa95dbfcef2da23c83fc9f2e7538ccc80cf1f4e6 ferm-1.2.tar.gz 89902
-SHA256 e627b46e9f8878ecf3f6767f4385e8611f64e1ac8bdef4fa61cc3b8a6d89fc61 ferm-1.2.tar.gz 89902
diff --git a/net-misc/ferm/files/digest-ferm-1.2.5 b/net-misc/ferm/files/digest-ferm-1.2.5
new file mode 100644
index 000000000000..f53cc21c9735
--- /dev/null
+++ b/net-misc/ferm/files/digest-ferm-1.2.5
@@ -0,0 +1,3 @@
+MD5 0e1e5a18ab712a0332be91e55d9180cb ferm-1.2.5.tar.gz 101878
+RMD160 5615f4ce4fe16a3b0aeabc1913b37935274bf97f ferm-1.2.5.tar.gz 101878
+SHA256 d62fbc0185844de0acd0ee5e77a58e9e2e243831dc21e584d2228874f846a47c ferm-1.2.5.tar.gz 101878