Ported ebuild to EAPI-2. See bug #266839.

(Portage version: 2.1.6.13/cvs/Linux i686)

2 files changed, 16 insertions, 45 deletions

diff --git a/sys-apps/qingy/ChangeLog b/sys-apps/qingy/ChangeLog
index 68ba9452bca2..8544f22e6c32 100644
--- a/sys-apps/qingy/ChangeLog
+++ b/sys-apps/qingy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/qingy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.60 2009/10/19 10:43:37 s4t4n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.61 2010/03/11 16:06:12 s4t4n Exp $
+
+  11 Mar 2010; Michele Noberasco <s4t4n@gentoo.org> qingy-0.9.9.ebuild:
+  Ported ebuild to EAPI-2. See bug #266839.
 
   11 May 2009; Michele Noberasco <s4t4n@gentoo.org> qingy-0.9.6-r3.ebuild,
   qingy-0.9.7.ebuild, qingy-0.9.8.ebuild, qingy-0.9.9.ebuild:
diff --git a/sys-apps/qingy/qingy-0.9.9.ebuild b/sys-apps/qingy/qingy-0.9.9.ebuild
index aba64dd6148d..5f64c9ac9d4f 100644
--- a/sys-apps/qingy/qingy-0.9.9.ebuild
+++ b/sys-apps/qingy/qingy-0.9.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.9.9.ebuild,v 1.2 2009/10/19 10:43:37 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-0.9.9.ebuild,v 1.3 2010/03/11 16:06:12 s4t4n Exp $
+
+EAPI="2"
 
 inherit elisp-common eutils pam
 
@@ -19,7 +21,7 @@ IUSE="crypt directfb emacs gpm opensslcrypt pam static X"
 RDEPEND=">=sys-libs/ncurses-5.4-r6
 	opensslcrypt? ( >=dev-libs/openssl-0.9.7e )
 	crypt?        ( >=dev-libs/libgcrypt-1.2.1 )
-	directfb?     ( >=dev-libs/DirectFB-0.9.24 )
+	directfb?     ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] )
 	emacs?        ( virtual/emacs )
 	pam?          ( >=sys-libs/pam-0.75-r11 )
 	X?            ( x11-libs/libX11
@@ -34,54 +36,21 @@ RDEPEND="${RDEPEND}
 
 SITEFILE=50${PN}-gentoo.el
 
-src_unpack()
+src_configure()
 {
+	local crypto_support="--disable-crypto"
+	local emacs_support="--disable-emacs"
+
 	if use crypt && use opensslcrypt; then
 		echo
-		eerror "You can have openssl or libgcrypt as a crypto library, not both."
-		eerror "Please check your USE flags..."
+		ewarn "You can have openssl or libgcrypt as a crypto library, not both."
+		ewarn "Using libgcrypt now..."
 		echo
-		die "USE flags check failed"
-	fi
-
-	if use directfb; then
-
-		if ! built_with_use -a dev-libs/DirectFB fbcon jpeg png truetype; then
-			echo
-			eerror "qingy expects DirectFB to provide certain capabilities."
-			eerror "It depends on the theme you use, but at least the following USE flags"
-			eerror "should be enabled in DirectFB: fbcon jpeg png truetype."
-			eerror "You must rebuild DirectFB those USE flags enabled!"
-			echo
-			die "USE flags check failed"
-		fi
-
-		if has_version ">=dev-libs/DirectFB-1.2.6"; then
-			if built_with_use -a dev-libs/DirectFB X; then
-				echo
-				eerror "Detected DirectFB version >= 1.2.6."
-				eerror "For this version of DirectFB to work with qingy"
-				eerror "X USE flag must be disabled."
-				eerror "You must rebuild DirectFB with X USE flag disabled!"
-				echo
-				die "USE flags check failed"
-			fi
-		fi
-
 	fi
 
-	unpack ${A}
-}
-
-src_compile()
-{
-	local crypto_support="--disable-crypto"
-	local emacs_support="--disable-emacs"
-
 	use emacs 		 && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
 	use opensslcrypt && crypto_support="--enable-crypto=openssl"
 	use crypt        && crypto_support="--enable-crypto=libgcrypt"
-
 	econf                                      \
 		--sbindir=/sbin                        \
 		--disable-optimizations                \
@@ -93,7 +62,6 @@ src_compile()
 		${crypto_support}                      \
 		${emacs_support}					   \
 		|| die "Configuration failed"
-	emake || die "Compilation failed"
 }
 
 src_install()