net-nntp/xpn: Fix deps for gnome3, Version Bump, Fixes for Python

svn path=/sunrise/; revision=11962

4 files changed, 77 insertions, 64 deletions

diff --git a/net-nntp/xpn/ChangeLog b/net-nntp/xpn/ChangeLog
index 782a6de87..c64286764 100644
--- a/net-nntp/xpn/ChangeLog
+++ b/net-nntp/xpn/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-nntp/xpn
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -xpn-1.2.5.ebuild,
+  +xpn-1.2.6.ebuild:
+  Fix deps for gnome3, Version Bump, Fixes for Python
+
   17 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> -xpn-1.0.0.ebuild,
   +xpn-1.2.5.ebuild:
   Version bump.
diff --git a/net-nntp/xpn/Manifest b/net-nntp/xpn/Manifest
index 0d42d1196..5668955a7 100644
--- a/net-nntp/xpn/Manifest
+++ b/net-nntp/xpn/Manifest
@@ -1,4 +1,5 @@
-DIST xpn-1.2.5.tar.gz 285759 RMD160 cbbcf910f358a5b3ac4bf6f0be694d7feb51550a SHA1 121d5c7cbedb2854582ab71bf0e361f0233944e0 SHA256 20654007c2a89367827f7a403bf051852d7d343628f3d233772e8013d15be31f
-EBUILD xpn-1.2.5.ebuild 1372 RMD160 6abc6aad7b44392ff3e40508cd7eee08a66acfe7 SHA1 21ffb8c4a0a5c390385b194a97a75a5287338fc0 SHA256 eb8e23e000da0f6f1e934161312bc7a3097e2141932b2d5965b85f467288247c
-MISC ChangeLog 1004 RMD160 baed42371c14a19c0d3c949ddbcdb4a5142cad00 SHA1 a05a980b8da8528dd1f7c1a83639762078ab9ce0 SHA256 86eeacde1015b87bf753d01828d2e9e6ae6779785994d93b295d0710ef78b3eb
+DIST xpn-1.2.6.tar.gz 286316 RMD160 672bb8cd22d8e4d03b98cf34701451225f35a9b7 SHA1 929a8e809121f3e286d5f36a76a0db5e2fa2875e SHA256 9683e1dd5d6f8aa7d53b811e5497787ff6d96579715ae0977f0c08c58facd84d
+DIST xpn_1.2.6-5.debian.tar.gz 22607 RMD160 0576d02ba9469eb1e42a833cb9dc7ee8a4c8b464 SHA1 fa6d4b1280ed75827966498f55a7df8bc908c866 SHA256 ddd6c727d1488df63cb9e9cec22b419f6ef1d2f48b96855466c454641a917a9c
+EBUILD xpn-1.2.6.ebuild 1306 RMD160 444222c4baf9d8835b64351098bfc0360c4e66d6 SHA1 af3c6c5736186447da9d7b620f410f2229bb3f50 SHA256 7a6ec0206a39bbeea0c7e1ce86b1e2499075bb19c309c2e474a9fab89b08b3ef
+MISC ChangeLog 1146 RMD160 6c40306bb75124fae59662b32a71d8ec4cf4436a SHA1 ac782678b7eb1197ab7d651423cbbbefe5612a47 SHA256 57f1d5323888f96145a3e979b360021ecfbee2f8be82f570bcd48233eb6a9c18
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/net-nntp/xpn/xpn-1.2.5.ebuild b/net-nntp/xpn/xpn-1.2.5.ebuild
deleted file mode 100644
index f95070973..000000000
--- a/net-nntp/xpn/xpn-1.2.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit python eutils multilib
-
-DESCRIPTION="A graphical newsreader written in Python"
-HOMEPAGE="http://xpn.altervista.org/index-en.html"
-SRC_URI="http://xpn.altervista.org/codice/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-LANGS="de fr it"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-DEPEND=""
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.10
-	>=x11-libs/gtk+-2.10"
-
-src_install() {
-	python_version
-	exeinto /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-	doexe ${PN}.py
-
-	for i in ${LANGS} ; do
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/lang
-		use linguas_${i} && doins -r lang/${i}
-	done
-
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/pixmaps
-	doins pixmaps/*
-
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/xpn_src
-	doins xpn_src/*
-
-	newicon pixmaps/xpn-icon.png ${PN}.png
-	make_desktop_entry "${PN} -d" ${PN} ${PN}.png "Network;News"
-
-	dodoc AUTHORS ChangeLog README
-	dohtml xpn.html
-
-	make_wrapper ${PN} ./${PN}.py /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-
-	python_need_rebuild
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/net-nntp/xpn/xpn-1.2.6.ebuild b/net-nntp/xpn/xpn-1.2.6.ebuild
new file mode 100644
index 000000000..241aed940
--- /dev/null
+++ b/net-nntp/xpn/xpn-1.2.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit eutils multilib python
+
+DESCRIPTION="A graphical newsreader written in Python"
+HOMEPAGE="http://xpn.altervista.org/index-en.html"
+SRC_URI="
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-5.debian.tar.gz
+	http://xpn.altervista.org/codice/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="de fr it"
+for i in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${i}"
+done
+
+DEPEND=""
+RDEPEND="
+	dev-python/pygtk
+	x11-libs/gtk+:2"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_convert_shebangs -r 2 .
+}
+
+src_prepare() {
+	# Debian Patches
+	epatch "${WORKDIR}"/debian/patches/0{1..4}*.patch
+}
+
+src_install() {
+	for i in ${LANGS} ; do
+		insinto /usr/share/locale
+		use linguas_${i} && doins -r lang/${i}
+	done
+
+	insinto $(python_get_sitedir)/${PN}/
+	doins -r pixmaps xpn_src ${PN}.py
+
+	newicon pixmaps/xpn-icon.png ${PN}.png
+	make_desktop_entry "${PN} -d" ${PN} /usr/share/pixmaps/${PN}.png "Network;News"
+
+	dodoc AUTHORS ChangeLog README
+	dohtml xpn.html
+
+	make_wrapper ${PN} "python2 ${PN}.py" $(python_get_sitedir)/${PN}
+
+	python_need_rebuild
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}