bumped EAPI to 5, simplified src_configure, default-enabled png because either it or jpeg should be default on (to satisfy REQUIRED_USE) and I like png more

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

2 files changed, 17 insertions, 11 deletions

diff --git a/dev-perl/Image-Scale/ChangeLog b/dev-perl/Image-Scale/ChangeLog
index 1c9c2da67d6a..aae7c571ffbd 100644
--- a/dev-perl/Image-Scale/ChangeLog
+++ b/dev-perl/Image-Scale/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Image-Scale
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Image-Scale/ChangeLog,v 1.3 2013/07/10 10:30:02 zlogene Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Image-Scale/ChangeLog,v 1.4 2014/08/26 17:01:28 axs Exp $
+
+*Image-Scale-0.80.0-r1 (26 Aug 2014)
+
+  26 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +Image-Scale-0.80.0-r1.ebuild, -Image-Scale-0.80.0.ebuild:
+  bumped EAPI to 5, simplified src_configure, default-enabled png because either
+  it or jpeg should be default on (to satisfy REQUIRED_USE) and I like png more
 
   10 Jul 2013; Mikle Kolyada <zlogene@gentoo.org> Image-Scale-0.80.0.ebuild:
   Make USE=gif as default wrt bug #422793
diff --git a/dev-perl/Image-Scale/Image-Scale-0.80.0.ebuild b/dev-perl/Image-Scale/Image-Scale-0.80.0-r1.ebuild
index 6a52811f78b7..5c8f87ab5f15 100644
--- a/dev-perl/Image-Scale/Image-Scale-0.80.0.ebuild
+++ b/dev-perl/Image-Scale/Image-Scale-0.80.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Image-Scale/Image-Scale-0.80.0.ebuild,v 1.2 2013/07/10 10:30:02 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Image-Scale/Image-Scale-0.80.0-r1.ebuild,v 1.1 2014/08/26 17:01:28 axs Exp $
 
-EAPI=4
+EAPI=5
 
 MODULE_AUTHOR=AGRUNDMA
 MODULE_VERSION=0.08
@@ -13,7 +13,7 @@ DESCRIPTION="Fast, high-quality fixed-point image resizing"
 LICENSE="|| ( GPL-2 GPL-3 )" # GPL2+
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+gif jpeg png test"
+IUSE="+gif jpeg +png test"
 
 REQUIRED_USE="|| ( jpeg png )"
 
@@ -22,7 +22,7 @@ RDEPEND="
 		media-libs/libpng:0
 	)
 	jpeg? (
-		media-libs/libjpeg-turbo
+		virtual/jpeg
 	)
 	gif? (
 		media-libs/giflib
@@ -40,12 +40,11 @@ PATCHES=(
 	"${FILESDIR}"/libpng-1.5-memcpy.patch
 	"${FILESDIR}"/0.80.0-disable_autodetect.patch
 )
-disable_use() {
-	use $1 || echo "--disable-$useflag"
-}
+
 src_configure() {
+	local myconf
 	for useflag in png jpeg gif; do
-		myconf+=( $(disable_use $useflag ) )
+		myconf+=( $(usex $useflag "" --disable-${useflag}) )
 	done
 	perl-module_src_configure
 }