clean up; quote variable; use emake instead of plain make

(Portage version: 2.1.3.19)

4 files changed, 10 insertions, 82 deletions

diff --git a/app-cdr/gtkcdlabel/ChangeLog b/app-cdr/gtkcdlabel/ChangeLog
index 8dfb6dbac8ec..fa610d6a4330 100644
--- a/app-cdr/gtkcdlabel/ChangeLog
+++ b/app-cdr/gtkcdlabel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/gtkcdlabel
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.30 2007/02/21 20:15:51 peper Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.31 2008/02/12 18:56:55 opfer Exp $
+
+  12 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  -gtkcdlabel-1.0_pre6.ebuild, -gtkcdlabel-1.0_pre7-r1.ebuild,
+  gtkcdlabel-1.0_pre8.ebuild:
+  clean up; quote variable; use emake instead of plain make
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild
deleted file mode 100644
index a207dd5e0a98..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild,v 1.9 2007/01/19 13:43:33 masterdriverz Exp $
-
-MY_P=${P/_}
-DESCRIPTION="A GTK+ frontend to cdlabelgen for easy and fast cd cover creation"
-HOMEPAGE="http://gtkcdlabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtkcdlabel/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc"
-
-RDEPEND=">=app-cdr/cdlabelgen-2.3.0
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	dev-util/pkgconfig
-	sys-devel/gcc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install problem"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7-r1.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7-r1.ebuild
deleted file mode 100644
index 6c699f9527fd..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7-r1.ebuild,v 1.3 2007/01/19 13:43:33 masterdriverz Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/_}
-DESCRIPTION="A GTK+ frontend to cdlabelgen for easy and fast cd cover creation"
-HOMEPAGE="http://gtkcdlabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtkcdlabel/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-
-RDEPEND=">=app-cdr/cdlabelgen-2.3.0
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=app-text/ggv-2.8"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	dev-util/pkgconfig
-	sys-devel/gcc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-
-	append-ldflags -export-dynamic
-	export LDFLAGS
-
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install problem"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild
index c908e9c986d2..7b7ab1102394 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild,v 1.7 2007/01/19 13:43:33 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre8.ebuild,v 1.8 2008/02/12 18:56:55 opfer Exp $
 
 inherit flag-o-matic
 
@@ -37,6 +37,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install problem"
+	emake DESTDIR="${D}" install || die "install problem"
 	dodoc AUTHORS ChangeLog README
 }