Add built_with_use check for bug 164514, missing quotes, and more.

(Portage version: 2.1.3_rc8)

2 files changed, 30 insertions, 31 deletions

diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index 93314600029b..1d0b4ffdb494 100644
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.35 2007/07/02 15:14:34 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.36 2007/07/15 19:14:07 drac Exp $
+
+  15 Jul 2007; Samuli Suominen <drac@gentoo.org> glame-2.0.1.ebuild:
+  Add built_with_use check for bug 164514, missing quotes, and more.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> glame-1.0.2.ebuild:
   (QA) RESTRICT clean up.
diff --git a/media-sound/glame/glame-2.0.1.ebuild b/media-sound/glame/glame-2.0.1.ebuild
index 7927468a2e2c..5882552d670b 100644
--- a/media-sound/glame/glame-2.0.1.ebuild
+++ b/media-sound/glame/glame-2.0.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v 1.9 2007/01/10 19:48:01 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-2.0.1.ebuild,v 1.10 2007/07/15 19:14:07 drac Exp $
 
 WANT_AUTOCONF=2.5
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="an audio file editing utility"
 HOMEPAGE="http://glame.sourceforge.net/"
-SRC_URI="mirror://sourceforge/glame/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,37 +16,37 @@ KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="nls gnome vorbis debug alsa"
 
 RDEPEND=">=dev-scheme/guile-1.4-r3
-	>=dev-libs/libxml-1.8.0
-	>=dev-libs/libxml2-2.0.0
+	>=dev-libs/libxml-1.8
+	>=dev-libs/libxml2-2
 	>=media-sound/esound-0.2
 	>=media-libs/audiofile-0.2.2
 	=sci-libs/fftw-2*
 	media-libs/libmad
 	media-libs/ladspa-sdk
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	gnome? ( >=gnome-base/libglade-2 >=gnome-base/libgnome-2.6\
-	>=gnome-base/libgnome-2.6 >=gnome-base/libgnomecanvas-2.6\
-	>=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.0 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	gnome? ( >=gnome-base/libglade-2 >=gnome-base/libgnome-2.6
+		>=gnome-base/libgnome-2.6 >=gnome-base/libgnomecanvas-2.6
+		>=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6 )
 	alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.11.3 )"
 
-RESTRICT="primaryuri"
+pkg_setup() {
+	if has_version =dev-scheme/guile-1.8*; then
+		built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag."
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
-
-	# fix makefile problem
-	cd ${S}/libltdl
+	cd "${S}"/libltdl
 	eautoconf
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-cflags.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cflags.patch
 }
 
 src_compile() {
-	if use gnome
-	then
+	if use gnome; then
 		# Use a valid icon for the GNOME menu entry
 		cp src/gui/glame.desktop src/gui/glame.desktop.old
 		sed -e 's:glame.png:glame-logo.jpg:' \
@@ -54,27 +54,23 @@ src_compile() {
 		rm src/gui/glame.desktop.old
 	fi
 
-	econf \
-		$(use_enable alsa alsatest) \
+	econf $(use_enable alsa alsatest) \
 		$(use_enable debug swapfiledebug) $(use_enable debug) \
 		$(use_enable gnome gui) \
 		$(use_enable nls) \
 		--enable-ladspa \
-		${myconf} || die "Configuration failed"
+		${myconf} || die "econf failed."
 
-	emake || die "Compilation failed"
+	emake || die "emake failed."
 }
 
-src_install () {
-	einstall || die "Installation failed"
+src_install() {
+	einstall || die "einstall failed."
 
-	if use gnome
-	then
+	if use gnome; then
 		dodir /usr/share/pixmaps
-		dosym ../glame/pixmaps/glame-logo.jpg \
-		      /usr/share/pixmaps/glame-logo.jpg
+		dosym ../glame/pixmaps/glame-logo.jpg /usr/share/pixmaps/glame-logo.jpg
 	fi
 
-	dodoc AUTHORS BUGS CREDITS ChangeLog MAINTAINERS \
-		NEWS README TODO
+	dodoc AUTHORS BUGS CREDITS ChangeLog MAINTAINERS NEWS README TODO
 }