[patch] net-firewall/shorewall-common-4.0.10.ebuild.diff

shorewall-common-4.0.10.ebuild.diff (text/plain), 3.06 KB, created by Vieri on 2008-03-31 10:38:32 UTC

--- /usr/portage/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild	2008-02-25 19:36:48.000000000 +0100
+++ shorewall-common-4.0.10.ebuild	2008-03-31 12:03:58.000000000 +0200
@@ -2,22 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild,v 1.2 2008/02/25 18:06:26 pva Exp $
 
-inherit eutils
+inherit eutils versionator
 
-# Select version (stable, RC, Beta, upstream patched):
-MY_P_TREE="4.0"   # stable/devel (eg. "4.0" or "development/4.0")
-MY_P_BETA=""      # stable or experimental (eg. "-RC1" or "-Beta4")
-MY_P_PATCH=""     # upstream patch (eg. ".2")
+# Select version (stable, RC, Beta):
+MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
+MY_P_BETA=""                                    # stable or experimental (eg. "-RC1" or "-Beta4")
+MY_PV_BASE=$(get_version_component_range 1-3)
 
-MY_P="${P/-common/}${MY_P_BETA}"
 MY_PN="${PN/-common/}"
-
+MY_P="${MY_PN}-${MY_PV_BASE}${MY_P_BETA}"
 MY_P_DOCS="${MY_P/${MY_PN}/${MY_PN}-docs-html}"
 
 DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/${P}${MY_P_PATCH}${MY_P_BETA}.tar.bz2
-	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2
+	doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,7 +40,7 @@
 src_install() {
 	keepdir /var/lib/shorewall
 
-	cd "${WORKDIR}/${P}${MY_P_PATCH}${MY_P_BETA}"
+	cd "${WORKDIR}/${P}${MY_P_BETA}"
 	PREFIX="${D}" ./install.sh || die "install.sh failed"
 	newinitd "${FILESDIR}"/shorewall.initd shorewall || die "doinitd failed"
 
@@ -52,7 +51,7 @@
 		dohtml -r *
 		## dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
 		# install samples
-		cp -pR "${S}${MY_P_PATCH}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
+		cp -pR "${S}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}"
 	fi
 }
 
@@ -73,7 +72,7 @@
 	elog "Do not blindly start shorewall, edit the files in /etc/shorewall first"
 	elog "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
 	elog
-	elog "Be aware that version ${MY_P_TREE} differs substantially from previous releases."
+	elog "Be aware that version ${MY_PV_TREE} differs substantially from previous releases."
 	elog "Information on upgrading is available at:"
 	elog "http://www.shorewall.net/upgrade_issues.htm"
 	elog
@@ -88,7 +87,7 @@
 	elog "in /etc/make.conf (man make.conf)."
 	elog
 	elog "Known problems:"
-	elog "http://shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/known_problems.txt"
+	elog "http://shorewall.net/pub/${MY_PN}/${MY_PV_TREE}/${MY_P}/known_problems.txt"
 	elog
 	elog "Whether upgrading or installing you should run shorewall check,"
 	elog "correct any errors found and run shorewall restart|start."