Fix testing, #408683; Moved to EAPI=4 to use REQUIRED_USE; drop old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 25 insertions, 142 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 3bd336cb5691..70f0af6c9e7f 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gajim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.129 2011/10/29 19:55:46 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.130 2012/03/18 08:58:56 jlec Exp $
+
+  18 Mar 2012; Justin Lecher <jlec@gentoo.org> -gajim-0.14.4.ebuild,
+  gajim-0.14.4-r1.ebuild, gajim-0.14.4-r2.ebuild:
+  Fix testing, #408683; Moved to EAPI=4 to use REQUIRED_USE; drop old
 
 *gajim-0.14.4-r2 (29 Oct 2011)
 
diff --git a/net-im/gajim/gajim-0.14.4-r1.ebuild b/net-im/gajim/gajim-0.14.4-r1.ebuild
index bfc85ad5ae67..f14589cdfa35 100644
--- a/net-im/gajim/gajim-0.14.4-r1.ebuild
+++ b/net-im/gajim/gajim-0.14.4-r1.ebuild
@@ -1,8 +1,8 @@
-# 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-im/gajim/gajim-0.14.4-r1.ebuild,v 1.7 2011/10/27 06:35:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r1.ebuild,v 1.8 2012/03/18 08:58:56 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="sqlite xml"
@@ -18,10 +18,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
 
-# needs EAPI=4
-#REQUIRED_USE="
-#	libnotify? ( dbus )
-#	avahi? ( dbus )"
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
 
 COMMON_DEPEND="
 	dev-python/pygtk:2
@@ -63,16 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 	xhtml? ( dev-python/docutils )"
 
 pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	fi
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -95,7 +84,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
 	dohtml README.html || die
diff --git a/net-im/gajim/gajim-0.14.4-r2.ebuild b/net-im/gajim/gajim-0.14.4-r2.ebuild
index 8831eb604696..ba520dd22a12 100644
--- a/net-im/gajim/gajim-0.14.4-r2.ebuild
+++ b/net-im/gajim/gajim-0.14.4-r2.ebuild
@@ -1,8 +1,8 @@
-# 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-im/gajim/gajim-0.14.4-r2.ebuild,v 1.1 2011/10/29 19:55:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4-r2.ebuild,v 1.2 2012/03/18 08:58:56 jlec Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="sqlite xml"
@@ -18,10 +18,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
 
-# needs EAPI=4
-#REQUIRED_USE="
-#	libnotify? ( dbus )
-#	avahi? ( dbus )"
+REQUIRED_USE="
+	libnotify? ( dbus )
+	avahi? ( dbus )"
 
 COMMON_DEPEND="
 	dev-python/pygtk:2
@@ -63,16 +62,6 @@ RDEPEND="${COMMON_DEPEND}
 	xhtml? ( dev-python/docutils )"
 
 pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	fi
 	python_set_active_version 2
 	python_pkg_setup
 }
@@ -83,6 +72,11 @@ src_prepare() {
 		"${FILESDIR}"/0.14.1-testing.patch \
 		"${FILESDIR}"/${P}-debian_patches_unicode.patch
 	echo '#!/bin/sh' > config/py-compile
+
+	cat >> po/POTFILES.in <<- EOF
+	src/command_system/implementation/custom.py
+	src/command_system/implementation/standard.py
+	EOF
 }
 
 src_configure() {
@@ -95,7 +89,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
 	dohtml README.html || die
diff --git a/net-im/gajim/gajim-0.14.4.ebuild b/net-im/gajim/gajim-0.14.4.ebuild
deleted file mode 100644
index 12212664b91d..000000000000
--- a/net-im/gajim/gajim-0.14.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.14.4.ebuild,v 1.4 2011/10/27 06:35:47 tetromino Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite xml"
-
-inherit eutils python versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gmail gnome idle jingle libnotify networkmanager nls spell srv X xhtml"
-
-COMMON_DEPEND="
-	dev-python/pygtk:2
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	dev-util/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyopenssl
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto
-		)
-	dbus? (
-		dev-python/dbus-python
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
-		)
-	gmail? ( net-dns/bind-tools )
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farsight2[python] )
-	networkmanager? (
-			dev-python/dbus-python
-			net-misc/networkmanager
-		)
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	spell? ( app-text/gtkspell:2 )
-	xhtml? ( dev-python/docutils )"
-
-pkg_setup() {
-	if ! use dbus; then
-		if use libnotify; then
-			eerror "The dbus USE flag is required for libnotify support"
-			die "USE=\"dbus\" needed for libnotify support"
-		fi
-		if use avahi; then
-			eerror "The dbus USE flag is required for avahi support"
-			die "USE=\"dbus\" needed for avahi support"
-		fi
-	fi
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/0.14-python-version.patch \
-		"${FILESDIR}"/0.14.1-testing.patch
-	echo '#!/bin/sh' > config/py-compile
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		--docdir="/usr/share/doc/${PF}" \
-		--libdir="$(python_get_sitedir)" \
-		--enable-site-packages
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}/usr/share/doc/${PF}/"{README.html,COPYING} || die
-	dohtml README.html || die
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}