Version bump. Remove old versions. Dependancy fix as per bug #78335

(Portage version: 2.0.51-r14)

9 files changed, 34 insertions, 63 deletions

diff --git a/app-cdr/gtkcdlabel/ChangeLog b/app-cdr/gtkcdlabel/ChangeLog
index 33ff2869ce27..87d223fd5503 100644
--- a/app-cdr/gtkcdlabel/ChangeLog
+++ b/app-cdr/gtkcdlabel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/gtkcdlabel
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.14 2005/01/01 12:13:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/ChangeLog,v 1.15 2005/01/24 09:25:06 dragonheart Exp $
+
+*gtkcdlabel-1.0_pre7 (24 Jan 2005)
+
+  24 Jan 2005; Daniel Black <dragonheart@gentoo.org> -gtkcdlabel-0.6.8.ebuild,
+  -gtkcdlabel-0.9.4.ebuild, gtkcdlabel-1.0_pre3.ebuild,
+  gtkcdlabel-1.0_pre6.ebuild, +gtkcdlabel-1.0_pre7.ebuild:
+  Version bump. Remove old versions. Dependancy fix as per bug #78335 thanks to
+  Lars Schünzel <yahoo@l61.de>
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   gtkcdlabel-1.0_pre3.ebuild:
diff --git a/app-cdr/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
index 5054042d5372..2373530d07b8 100644
--- a/app-cdr/gtkcdlabel/Manifest
+++ b/app-cdr/gtkcdlabel/Manifest
@@ -1,10 +1,8 @@
 MD5 259c343e222cef392b2451c44821f0df ChangeLog 1484
-MD5 0baf69793804801f0b819c4e288030d3 gtkcdlabel-0.6.8.ebuild 1246
-MD5 6e37e64b0ae0b092659cda0e4aa1a599 gtkcdlabel-0.9.4.ebuild 779
-MD5 71a3aceb0b9568752e4a96068f5c4a0e gtkcdlabel-1.0_pre3.ebuild 819
-MD5 60e67fa63704d2b166b0f31b883dd735 gtkcdlabel-1.0_pre6.ebuild 927
+MD5 50014939dbd0f71d7171868097cf5977 gtkcdlabel-1.0_pre3.ebuild 824
+MD5 78b22d67d8bc2aeaae87a06a35a92783 gtkcdlabel-1.0_pre6.ebuild 931
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 a04bcd7f8c8b0dbf1ff6685f0da8eb8a files/digest-gtkcdlabel-0.6.8 68
-MD5 c90117a1f730d01196c8daf18e43bd4f files/digest-gtkcdlabel-0.9.4 69
+MD5 849583c5844c1f553ec4132bf77a280f gtkcdlabel-1.0_pre7.ebuild 932
+MD5 d7ee7d62014b9fa28eb2db67028e28cc files/digest-gtkcdlabel-1.0_pre7 71
 MD5 31fc5fdd1f546485e74c081065ddf534 files/digest-gtkcdlabel-1.0_pre3 71
 MD5 61f4ce77f924ab6c43cb682caa6e7973 files/digest-gtkcdlabel-1.0_pre6 71
diff --git a/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.6.8 b/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.6.8
deleted file mode 100644
index 11f759b91798..000000000000
--- a/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c98d73ffd5365bdb64cb2d6963c498b8 gtkcdlabel-0.6.8.tar.bz2 29780
diff --git a/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.9.4 b/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.9.4
deleted file mode 100644
index 1442dcf6593b..000000000000
--- a/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e1ce2637f137ba7315bf19d7b6f60ec gtkcdlabel-0.9.4.tar.bz2 142751
diff --git a/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-1.0_pre7 b/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-1.0_pre7
new file mode 100644
index 000000000000..e60a7c485c5d
--- /dev/null
+++ b/app-cdr/gtkcdlabel/files/digest-gtkcdlabel-1.0_pre7
@@ -0,0 +1 @@
+MD5 a8bf07e74cf0348a77c0e3bd7cf20705 gtkcdlabel-1.0pre7.tar.bz2 144681
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-0.6.8.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-0.6.8.ebuild
deleted file mode 100644
index 030f50905df2..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-0.6.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-0.6.8.ebuild,v 1.13 2005/01/01 12:13:58 eradicator Exp $
-
-DESCRIPTION="A GTK+ frontend to cdlabelgen for easy and fast cd cover creation."
-HOMEPAGE="http://gtkcdlabel.sourceforge.net"
-SRC_URI="mirror://sourceforge/gtkcdlabel/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc"
-
-RDEPEND=">=app-cdr/cdlabelgen-2.3.0
-	>=media-libs/libcdaudio-0.99.6
-	>=x11-libs/gtk+-1.2.0"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.6.1-r6"
-
-src_compile() {
-	# gtkcdlabel does not come with a configure, we must call
-	# autogen.sh with the configure switches.
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "configure problem"
-	# We must do this by hand.
-	cp po/Makevars.template po/Makevars
-	aclocal -I m4 || die "configure problem"
-	# Second run _is_ needed.
-	./autogen.sh \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install problem"
-}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.ebuild
index 4b284204434b..8d7088b2a576 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.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-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.ebuild,v 1.8 2005/01/01 12:13:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre3.ebuild,v 1.9 2005/01/24 09:25:06 dragonheart Exp $
 
 MY_P=${P/_}
 DESCRIPTION="A GTK+ frontend to cdlabelgen for easy and fast cd cover creation"
@@ -15,7 +15,7 @@ KEYWORDS="x86 ppc sparc"
 RDEPEND=">=app-cdr/cdlabelgen-2.3.0
 	>=media-libs/libcdaudio-0.99.6
 	>=x11-libs/gtk+-2
-	>=dev-util/glade-2
+	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2*"
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild
index 2d1f1b59fbb5..a67e19639abe 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.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-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild,v 1.3 2005/01/01 12:13:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre6.ebuild,v 1.4 2005/01/24 09:25:06 dragonheart Exp $
 
 MY_P=${P/_}
 DESCRIPTION="A GTK+ frontend to cdlabelgen for easy and fast cd cover creation"
@@ -10,12 +10,12 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 RDEPEND=">=app-cdr/cdlabelgen-2.3.0
 	>=media-libs/libcdaudio-0.99.6
 	>=x11-libs/gtk+-2
-	>=dev-util/glade-2
+	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2*"
 
 DEPEND="${RDEPEND}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-0.9.4.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7.ebuild
index 992a49ac45a8..d3fd23e59477 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-0.9.4.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7.ebuild
@@ -1,28 +1,36 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-0.9.4.ebuild,v 1.5 2005/01/01 12:13:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.0_pre7.ebuild,v 1.1 2005/01/24 09:25:06 dragonheart 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/${P}.tar.bz2"
-
+SRC_URI="mirror://sourceforge/gtkcdlabel/${MY_P}.tar.bz2"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 RDEPEND=">=app-cdr/cdlabelgen-2.3.0
 	>=media-libs/libcdaudio-0.99.6
 	>=x11-libs/gtk+-2
-	>=dev-util/glade-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
+	econf || die "configure problem"
 	emake || die "compile problem"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "install problem"
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog README
 }