Update per proxy-maintainer request. Remove overshadowed versions.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

6 files changed, 87 insertions, 103 deletions

diff --git a/net-firewall/ufw/ChangeLog b/net-firewall/ufw/ChangeLog
index a472dccd9265..d9fd0120c96b 100644
--- a/net-firewall/ufw/ChangeLog
+++ b/net-firewall/ufw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/ufw
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.4 2011/09/13 06:35:49 pva Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ChangeLog,v 1.5 2012/02/28 11:42:22 scarabeus Exp $
+
+*ufw-0.30.1-r4 (28 Feb 2012)
+
+  28 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/ufw-0.30.1-encoding.patch, +files/ufw-0.30.1-python-abis.patch,
+  +ufw-0.30.1-r4.ebuild, -ufw-0.30.1-r2.ebuild, -ufw-0.30.1-r3.ebuild:
+  Update per proxy-maintainer request. Remove overshadowed versions.
 
   13 Sep 2011; Peter Volkov <pva@gentoo.org> ufw-0.30.1-r2.ebuild,
   ufw-0.30.1-r3.ebuild:
diff --git a/net-firewall/ufw/Manifest b/net-firewall/ufw/Manifest
index 9011debebeec..f8864b157b66 100644
--- a/net-firewall/ufw/Manifest
+++ b/net-firewall/ufw/Manifest
@@ -1,24 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX rsyslog/ufw.logrotate 178 RMD160 3797baf7ddf541e338b27ef3275bd28db03fa179 SHA1 aeedd795ed99ad20f03bc36056da07ca51838dd0 SHA256 02d1a00ca68446fbe056a4c3aede319f77b3262e26092cc04ea46de8923d03f8
 AUX syslog-ng/syslog-ng.example 381 RMD160 e8b26557f5c7985d52b27f5a0bb3a2d459727063 SHA1 dfe3b055396156d3111e3283bd6e3f5f25b78566 SHA256 70a795c1b20e2cdef38565d74b9de042c6666f860a2fd1b3bdc6f31dd451bc68
 AUX syslog-ng/ufw.logrotate 269 RMD160 589a17944e28df50ba2822b1025ed2124f689b04 SHA1 fb9eb8fc41029a08323da0ec0a708a946338c432 SHA256 cddd86613bde19b45f0f935c65bb43721f69aefc14e7d629612b23ea3b5c5c97
+AUX ufw-0.30.1-encoding.patch 363 RMD160 db8a6a061df59f64c4521202bd7b364c87aa5bfa SHA1 9271a58fc6f17c00f70c2ddacea1c33acd2c2751 SHA256 9f679761dd53a12f630c1331dbcf471ecd11b6334b6cee6765297af7c0eca803
+AUX ufw-0.30.1-python-abis.patch 921 RMD160 b3232aed2698d42054b4bd1cc852a325bfc5f489 SHA1 90d490e9c91e3cdc4a08b4f821bea9652655dd1f SHA256 bcb6d1846cac9677114fd18058c1acd92c912a92901dfc2f9f52cb11e3e23eaa
 AUX ufw-2.initd 2726 RMD160 91c510dabf76eb6f7e416dc5af27ce52ffbe09ec SHA1 81148f04f44a3194588e6a63a99676d46dc63f8e SHA256 3136432d91dfa6bcfde81590b628dbef59b8ff4b8b01118838be5e9e3c37e1d9
 AUX ufw-dont-check-iptables.patch 1572 RMD160 76245c0aa6adc3edbadd311c2482aa9cad5e7824 SHA1 268d86725e202b2c1a8243907d143085f92aff53 SHA256 2ea0f9525baa82386690577525631f468e56a0fbde0e7e5a65fba36c922ea96f
 AUX ufw-move-path.patch 7135 RMD160 c4dba2bbc70072d4ffe270ffb70176a4cabd696c SHA1 10a95973b4c6b9ea271691993157e1b9193d435d SHA256 f8036c343f52e12493d1019e83dfdda505fae68bbc4b46144ec73033a9d4a578
 AUX ufw.confd 219 RMD160 cce23a5af2c48845fde0bed837e0a2faaeb3f5c4 SHA1 b88ef87f18dbe154545a427fbf155c22c23ace1a SHA256 069aa7382b40aecebf26ef53f3f4c49890314e0357925c84b3c15f1d0b913be0
 DIST ufw-0.30.1.tar.gz 297322 RMD160 7e1fc1bb77495d9d24e058546edcb2ea3832f04b SHA1 a128685ea560f2de27d5d311b6dd07f590f1dafb SHA256 98da13fe3e9aa8ff29611f20ef6e8b15be42bcdc43c8ef3145755b220f3bae1a
-EBUILD ufw-0.30.1-r2.ebuild 2513 RMD160 c497471e4472a94502480b4a97d1cc9d18caff27 SHA1 4241947655fe1689a6000599bdb838c0028470b6 SHA256 83ea776dd8c9c8a38ea2701f93ff91987bed1de9a63169c32bf00af85ab55be1
-EBUILD ufw-0.30.1-r3.ebuild 2896 RMD160 12177614c9e1bfb01fdce61549ccadb83116bf69 SHA1 6d6c40411b05f9bfaf9fb9e2d0f8b91269ee1d17 SHA256 4c70d1f2bd368b6081aee5f923095d7e33932e21b2f139cf2f8c02ef0057e97f
-MISC ChangeLog 1209 RMD160 6a9acf8f8bac83fde532b4605ac69e838648bd18 SHA1 c8dfb0c63d1d97390be6c28cce5cbeddbf4fe108 SHA256 c9187fbaf1d978c83ec5afc00a7581c141aebfb4e4c2a537a21395dae01a9ee9
+EBUILD ufw-0.30.1-r4.ebuild 2964 RMD160 4c52800234091406c3d79b4d0374228a88a65478 SHA1 d695b30deebf7fa918040854a2d5628a6ba3f71e SHA256 a0e6b960244c3da181e7db9c55d392807081f49e7ef1dc0e1b14afe5fb8cc120
+MISC ChangeLog 1514 RMD160 dc08c6714dede44ad4b449cfa939fd7506984e6a SHA1 dae82e0fdf1ac06acb52c58f3ae2ef14b8abca83 SHA256 ab6f716406a3258f6ef8de7935c067cc9cfdc2499ae5d6aa51f5d2001c5fc4f5
 MISC metadata.xml 622 RMD160 cc250e699c5508a3e5ea12a0dd185c831bec7bd1 SHA1 7eea3cc02842a8b3b8dc053fbeaa4ab4ae5b592e SHA256 e504f88d893e02ac0bf5aa71b5b153da69205bcc72463a24b551918686afdcc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59qT4ACgkQfXuS5UK5QB3E9gQAow+8l+D0dEFl5vxdbflD1mOC
-8XBeCNVQsYj7g4sgI1VKjXBDdIfVz9Fwbae4zRfRBHPU4FiAR1tDe5/60wwTQxsw
-0w6UT4GbFTpWINbKpq5XxWcYvWgPuK68FSWrxSjpwthNb8A5C7ffgPsR2Qu+fZFi
-1D6UNm9ZFSb36c3Cd1s=
-=GSOF
+iQIcBAEBAgAGBQJPTL2sAAoJEOSiRoyO7jvoQnoP/iw1Uwj8S7l4IS3b0MXlt92p
+9gnLlJz1Xx+t+n/1JQZYB+eIi3BxuqkF7MeMpCS/f852ITYFuU6O0kOJOVA1OaIN
+QRxrX5WnKE1RLM/VSuPusFYjjZAZiYQF9eRmksL6EYVSi0L0MStLWTcS7bMV2W5b
+zVm6jFJpSjOP0sH1+K81457yMAt5p58Ss8nK6JIf/AhFVLlL2skgbrpgYuU2BCQo
+XAEnkszB+a4a5onOAtVr4ierZJlDA8q/ckRfixTySWU/qFoV+C8g9trS9X/jVkjq
+0xdN0r6Y+rzekUhNhl5y86sdoUFKq767yTkxor6Aboi/wvHK2rS+IsJJpyepB28e
+Oc7+fOYY2Fd1W9OiwF2hoiaPF7cPLXSkttnD0qtjlDvOZd0O9e5PA73RYMrivq2e
+X+b5wokiNe/49JgRtL8S+rH+Ky6d4QOgHjO2pU7JSNpr8aa3OUkptq28xFndxudx
+kbOb15MJ1BVoxycGSQnv3bfSsq7T/B2iNldYchUPGK67SBLU0LjhpFL4oJCW+Inq
+og9EZbsU9+1bo1e33fzV9kVzybwJ91fab8TPsjyXRTnMsMQzULJsBV9hX3KBQC6j
+1iVopTMtygHFmUO5mxWdHr6OzG1124dum8sj/VIk4JxoOQ1gle3TW/LS6ECvKxDO
+GfPn04ic1hP57ap1uOh/
+=uHFB
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ufw/files/ufw-0.30.1-encoding.patch b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
new file mode 100644
index 000000000000..a4626ef0cff0
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.30.1-encoding.patch
@@ -0,0 +1,15 @@
+Fixes usage with ufw-frontends.
+upstream bug report: https://bugs.launchpad.net/ufw/+bug/921758
+--- src/util.py
++++ src/util.py
+@@ -205,8 +205,9 @@
+ 
+ def open_file_read(f):
+     '''Opens the specified file read-only'''
++    import codecs
+     try:
+-        orig = open(f, 'r')
++        orig = codecs.open(f, 'r', "UTF-8")
+     except Exception:
+         raise
+ 
diff --git a/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch
new file mode 100644
index 000000000000..b924012790e4
--- /dev/null
+++ b/net-firewall/ufw/files/ufw-0.30.1-python-abis.patch
@@ -0,0 +1,21 @@
+This patch fixes strings substitution in common.py during package
+build with ebuild supporting installation for multiple Python versions.
+
+With support for multiple Python versions in the ebuild, seems the
+file isn't copied from staging/ to build-*/lib/ufw/ after being
+modified. That's why the copy needs to be done "manually" here.
+The issue occurs with "setup.py build -b build-XXX" followed by
+"setup.py build -b build-XXX install".
+
+probably related: https://bugs.launchpad.net/ufw/+bug/819600
+--- setup.py
++++ setup.py
+@@ -89,6 +89,8 @@
+                              "-i",
+                              "s%#SHARE_DIR#%" + real_sharedir + "%g",
+                              os.path.join('staging', file)])
++            self.copy_file(os.path.join('staging', file),
++                           os.path.join(self.build_base, "lib", "ufw"))
+ 
+         # Now byte-compile everything
+         super(Install, self).run()
diff --git a/net-firewall/ufw/ufw-0.30.1-r2.ebuild b/net-firewall/ufw/ufw-0.30.1-r2.ebuild
deleted file mode 100644
index 64b37228008a..000000000000
--- a/net-firewall/ufw/ufw-0.30.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r2.ebuild,v 1.3 2011/09/13 06:35:49 pva Exp $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-
-inherit versionator bash-completion-r1 eutils linux-info distutils
-
-MY_PV_12=$(get_version_component_range 1-2)
-DESCRIPTION="A program used to manage a netfilter firewall"
-HOMEPAGE="http://launchpad.net/ufw"
-SRC_URI="http://launchpad.net/ufw/${MY_PV_12}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=">=net-firewall/iptables-1.4"
-
-# tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
-RESTRICT="test"
-
-pkg_setup() {
-	local CONFIG_CHECK="~PROC_FS ~NETFILTER_XT_MATCH_COMMENT ~IP6_NF_MATCH_HL \
-		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT \
-		~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
-
-	if kernel_is -ge 2 6 39; then
-		CONFIG_CHECK+=" ~NETFILTER_XT_MATCH_ADDRTYPE"
-	else
-		CONFIG_CHECK+=" ~IP_NF_MATCH_ADDRTYPE"
-	fi
-
-	check_extra_config
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Allow to remove unnecessary build time dependency
-	# on net-firewall/iptables.
-	epatch "${FILESDIR}"/${PN}-dont-check-iptables.patch
-	# Move files away from /lib/ufw.
-	epatch "${FILESDIR}"/${PN}-move-path.patch
-	# Set as enabled by default. User can enable or disable
-	# the service by adding or removing it to/from a runlevel.
-	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
-		|| die "sed failed (ufw.conf)"
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/ufw.confd ufw || die "inserting a file to conf.d failed"
-	newinitd "${FILESDIR}"/ufw-2.initd ufw || die "inserting a file to init.d failed"
-	if use examples; then
-		dodoc doc/rsyslog.example || die "inserting example rsyslog configuration failed"
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die "inserting example files failed"
-	fi
-	distutils_src_install
-	newbashcomp shell-completion/bash ${PN} || die "newbashcomp failed"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	if path_exists -o "${EROOT}"lib/ufw/user{,6}.rules; then
-		ewarn "Attention!"
-		ewarn "User configuration from /lib/ufw is now placed in /etc/ufw/user."
-		ewarn "Please stop ufw, copy .rules files from ${EROOT}lib/ufw"
-		ewarn "to ${EROOT}etc/ufw/user/ and start ufw again."
-	fi
-	echo
-	elog "Remember to enable ufw add it to your boot sequence:"
-	elog "-- # ufw enable"
-	elog "-- # rc-update add ufw boot"
-}
diff --git a/net-firewall/ufw/ufw-0.30.1-r3.ebuild b/net-firewall/ufw/ufw-0.30.1-r4.ebuild
index d05d12ece1e6..d043b6d3936b 100644
--- a/net-firewall/ufw/ufw-0.30.1-r3.ebuild
+++ b/net-firewall/ufw/ufw-0.30.1-r4.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r3.ebuild,v 1.2 2011/09/13 06:35:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ufw/ufw-0.30.1-r4.ebuild,v 1.1 2012/02/28 11:42:22 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit versionator bash-completion-r1 eutils linux-info distutils
 
@@ -17,13 +19,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND=""
+DEPEND="sys-devel/gettext"
 RDEPEND=">=net-firewall/iptables-1.4"
 
 # tests fail; upstream bug: https://bugs.launchpad.net/ufw/+bug/815982
 RESTRICT="test"
 
-pkg_setup() {
+pkg_pretend() {
 	local CONFIG_CHECK="~PROC_FS ~NETFILTER_XT_MATCH_COMMENT ~IP6_NF_MATCH_HL \
 		~NETFILTER_XT_MATCH_LIMIT ~NETFILTER_XT_MATCH_MULTIPORT \
 		~NETFILTER_XT_MATCH_RECENT ~NETFILTER_XT_MATCH_STATE"
@@ -35,7 +37,9 @@ pkg_setup() {
 	fi
 
 	check_extra_config
-	python_set_active_version 2
+}
+
+pkg_setup() {
 	python_pkg_setup
 }
 
@@ -45,6 +49,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-dont-check-iptables.patch
 	# Move files away from /lib/ufw.
 	epatch "${FILESDIR}"/${PN}-move-path.patch
+	# Allows correct build with SUPPORT_PYTHON_ABIS="1" (see comment in the file).
+	epatch "${FILESDIR}"/${P}-python-abis.patch
+	# Fixes usage with ufw-frontends (bug ref. inside the patch).
+	epatch "${FILESDIR}"/${P}-encoding.patch
 	# Set as enabled by default. User can enable or disable
 	# the service by adding or removing it to/from a runlevel.
 	sed -i 's/^ENABLED=no/ENABLED=yes/' conf/ufw.conf \
@@ -52,23 +60,25 @@ src_prepare() {
 }
 
 src_install() {
-	newconfd "${FILESDIR}"/ufw.confd ufw || die "inserting a file to conf.d failed"
-	newinitd "${FILESDIR}"/ufw-2.initd ufw || die "inserting a file to init.d failed"
+	newconfd "${FILESDIR}"/ufw.confd ufw
+	newinitd "${FILESDIR}"/ufw-2.initd ufw
 
 	# users normally would want it
 	insinto /usr/share/doc/${PF}/logging
-	doins -r "${FILESDIR}"/syslog-ng || die "inserting syslog-ng configuration failed"
+	doins -r "${FILESDIR}"/syslog-ng
 
 	insinto /usr/share/doc/${PF}/logging/rsyslog
-	doins "${FILESDIR}"/rsyslog/* || die "inserting rsyslog configuration failed"
-	doins doc/rsyslog.example || die "inserting rsyslog.example failed"
+	doins "${FILESDIR}"/rsyslog/*
+	doins doc/rsyslog.example
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins examples/* || die "inserting example files failed"
+		doins examples/*
 	fi
 	distutils_src_install
-	newbashcomp shell-completion/bash ${PN} || die "newbashcomp failed"
+	domo locales/mo/*.mo
+	rm -r "${ED}"usr/share/${PN}/messages || die
+	newbashcomp shell-completion/bash ${PN}
 }
 
 pkg_postinst() {