From: Michele Noberasco Date: Thu, 11 Mar 2010 16:06:12 +0000 (+0000) Subject: Ported ebuild to EAPI-2. See bug #266839. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b3a86005fb8c136ca051422f09bc338ce5b8f5d;p=gentoo.git Ported ebuild to EAPI-2. See bug #266839. Package-Manager: portage-2.1.6.13/cvs/Linux i686 --- 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 qingy-0.9.9.ebuild: + Ported ebuild to EAPI-2. See bug #266839. 11 May 2009; Michele Noberasco 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/Manifest b/sys-apps/qingy/Manifest index 63f843b69877..7f8fcbfba1fb 100644 --- a/sys-apps/qingy/Manifest +++ b/sys-apps/qingy/Manifest @@ -9,6 +9,6 @@ EBUILD qingy-0.9.6-r1.ebuild 4650 RMD160 c88a5fbfa106c460b9f50b6481608e89cc32417 EBUILD qingy-0.9.6-r3.ebuild 4800 RMD160 1b0a61b98df4c535b4f966a4998ffcc1d139246e SHA1 d3d61baf220e6384ceab6b1dd06aa9ec4f0973ec SHA256 e194e2712588f119a493942a404eda7ec2aeb3cc853c03b6e8a39521523458e5 EBUILD qingy-0.9.7.ebuild 4794 RMD160 ef697ae2a7755a6c7b072e88280ce7df35b3fddb SHA1 e9bb0fd07ffd4c5803f43f20d2b4992f29606478 SHA256 959cea373be7bd6a396a6b3b0232e144a496e22d72dc351268cbe91aa258c376 EBUILD qingy-0.9.8.ebuild 4797 RMD160 ef4dd3c3160f4b95987dc39a685ff112bec0f5f6 SHA1 c818b73186d3892a1c696fe2582c74a58421157d SHA256 b453e719a3446edf33420676592d0d8edcefdda26471674430ccdbce50cb9904 -EBUILD qingy-0.9.9.ebuild 4797 RMD160 3c431deb4e92882796b8b825d4594611cf7f56eb SHA1 4d386d0c472bcb2a4978d920d2338df70939363f SHA256 918b91c2c478dc95ace749e28d5d72f61864e5b5ab28b80a18116c8f5ef9d634 -MISC ChangeLog 9880 RMD160 72a524501a8d34dd9dad6debd35ab7c8031319c2 SHA1 d3c4efb0fa06f9892558daac1691303399dbc878 SHA256 e53bb2f00fbe40e37558cb4e149d5368b4f33d66f60ad665b8cca51c0b5e1e14 +EBUILD qingy-0.9.9.ebuild 3907 RMD160 4e324ecc07237f41189dc2106278f4f97f4c7c18 SHA1 30e54f56fc67b64af0dee6d402ef9c1e52485364 SHA256 169666fbd0c57300257fd2bde7c94a3c5152db60a8c7c0be3e8a04f2275bd87d +MISC ChangeLog 9997 RMD160 4072f36dd19f70c939300e0730704c60ba371af6 SHA1 0bfa448632ac4e422cb899566f62ca1e0c6d6fae SHA256 af72ccf76a3d4f5a19523f279a9c3c232fb9589ffbc62f64f6f4ce0dfa41e8a0 MISC metadata.xml 390 RMD160 ae9ef275de4ccb7a391d7ea2b8f61f3bf74ad959 SHA1 05687860ba228c04b4e0fd605379f0a60eea0f71 SHA256 6356b21936d7923ae85b5b6b9b4813e6e0401b2a88149b45768e02eb910f2175 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()