sparc/x86 stable, version bump wrt bug #197274

(Portage version: 2.1.3.16)

5 files changed, 21 insertions, 12 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/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