use built_with_use (bug #83044); tidy

(Portage version: 2.0.51-r15)

3 files changed, 35 insertions, 40 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 160775487be1..3ba1d1b8db3f 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/analog
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.30 2005/01/01 10:54:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.31 2005/02/24 02:14:28 mr_bones_ Exp $
+
+  23 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> analog-5.32.ebuild,
+  analog-6.0.ebuild:
+  use built_with_use (bug #83044); tidy
 
 *analog-6.0 (31 Dec 2004)
 
diff --git a/app-admin/analog/analog-5.32.ebuild b/app-admin/analog/analog-5.32.ebuild
index b461419573cf..4f6d97d8637a 100644
--- a/app-admin/analog/analog-5.32.ebuild
+++ b/app-admin/analog/analog-5.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.17 2005/01/01 10:54:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.18 2005/02/24 02:14:28 mr_bones_ Exp $
 
 inherit eutils
 
@@ -13,43 +13,39 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/libpcre-3.4
+DEPEND=">=dev-libs/libpcre-3.4
 	>=media-libs/gd-1.8.4-r2
 	sys-libs/zlib
 	media-libs/jpeg
 	media-libs/libpng"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 pkg_setup() {
-	local gd_use="$(</var/db/pkg/`best_version media-libs/gd`/USE)"
-	if [ ! "`has jpeg ${gd_use}`" ] ; then
+	if ! built_with_use media-libs/gd jpeg ; then
 		eerror "libgd is missing jpeg support. Please add"
 		eerror "'jpeg' to your USE flags, and re-emerge libgd."
 		die "libgd needs jpeg support"
 	fi
-
-	return 0
 }
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
-}
-
-src_compile() {
-	ebegin "Configuring"
-	sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+	sed -i \
+		-e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
 		-e "s:^LIBS.*:LIBS = -lgd -lz -lpcre -lm -lpng -ljpeg:" \
-		src/Makefile
-	eend $?
+		src/Makefile \
+		|| die "sed failed"
+}
 
+src_compile() {
 	make -C src || die "make failed"
 }
 
 src_install() {
-	dobin analog ; newman analog.man analog.1
+	dobin analog || die "dobin failed"
+	newman analog.man analog.1
 
 	dodoc README.txt Licence.txt analog.cfg
 	dohtml -a html,gif,css,ico docs/*
@@ -61,5 +57,5 @@ src_install() {
 	insinto /usr/share/analog/lang ; doins lang/*
 	dodir /var/log/analog
 	dosym /usr/share/analog/images /var/log/analog/images
-	insinto /etc/analog ; doins ${FILESDIR}/analog.cfg
+	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
 }
diff --git a/app-admin/analog/analog-6.0.ebuild b/app-admin/analog/analog-6.0.ebuild
index 16131820f884..11320d650035 100644
--- a/app-admin/analog/analog-6.0.ebuild
+++ b/app-admin/analog/analog-6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0.ebuild,v 1.2 2005/01/01 10:54:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0.ebuild,v 1.3 2005/02/24 02:14:28 mr_bones_ Exp $
 
 inherit eutils
 
@@ -13,44 +13,39 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/libpcre-3.4
+DEPEND=">=dev-libs/libpcre-3.4
 	>=media-libs/gd-1.8.4-r2
 	sys-libs/zlib
 	media-libs/jpeg
 	media-libs/libpng"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 pkg_setup() {
-	local gd_use="$( cat /var/db/pkg/`best_version media-libs/gd`/USE | grep jpeg )"
-
-	if [ -z "${gd_use}" ] ; then
+	if ! built_with_use media-libs/gd jpeg ; then
 		eerror "libgd is missing jpeg support. Please add"
 		eerror "'jpeg' to your USE flags, and re-emerge libgd."
 		die "libgd needs jpeg support"
 	fi
-
-	return 0
 }
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
-}
-
-src_compile() {
-	ebegin "Configuring"
-	sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
+	sed -i \
+		-e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
 		-e "s:^LIBS.*:LIBS = -lgd -lz -lpcre -lm -lpng -ljpeg:" \
-		src/Makefile
-	eend $?
+		src/Makefile \
+		|| die "sed failed"
+}
 
+src_compile() {
 	make -C src || die "make failed"
 }
 
 src_install() {
-	dobin analog ; newman analog.man analog.1
+	dobin analog || die "dobin failed"
+	newman analog.man analog.1
 
 	dodoc README.txt Licence.txt analog.cfg
 	dohtml -a html,gif,css,ico docs/*
@@ -62,5 +57,5 @@ src_install() {
 	insinto /usr/share/analog/lang ; doins lang/*
 	dodir /var/log/analog
 	dosym /usr/share/analog/images /var/log/analog/images
-	insinto /etc/analog ; doins ${FILESDIR}/analog.cfg
+	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
 }