15 files changed, 24 insertions, 239 deletions
diff --git a/app-cdr/cdlabelgen/ChangeLog b/app-cdr/cdlabelgen/ChangeLog
index 8f3ad1d3f32f..ef0b44b439d2 100644
--- a/app-cdr/cdlabelgen/ChangeLog
+++ b/app-cdr/cdlabelgen/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdlabelgen
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/ChangeLog,v 1.21 2005/06/18 19:39:33 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/ChangeLog,v 1.22 2005/06/18 19:53:21 tove Exp $
+
+  18 Jun 2005; Torsten Veller <tove@gentoo.org> -files/makefile.patch-2.4.0,
+  -files/makefile.patch-2.6.0, -files/makefile.patch-2.6.1,
+  -files/makefile.patch, -cdlabelgen-2.3.0.ebuild, -cdlabelgen-2.4.0.ebuild,
+  -cdlabelgen-2.6.0.ebuild, -cdlabelgen-2.6.1.ebuild,
+  cdlabelgen-3.0.0.ebuild:
+  Removed old ebuilds.
+  Fixed HOMEPAGE and SRC_URI -- bug #86372.
 
 *cdlabelgen-3.5.0 (18 Jun 2005)
 
diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
index 2330b4b1bfa3..5ac27476e7da 100644
--- a/app-cdr/cdlabelgen/Manifest
+++ b/app-cdr/cdlabelgen/Manifest
@@ -1,18 +1,16 @@
-MD5 1ee3b9b57a04d02be4a596cec7bd378f cdlabelgen-2.6.0.ebuild 707
-MD5 f8a632897e72961e569a51b074a3d5b7 cdlabelgen-2.3.0.ebuild 708
-MD5 165af3eee3fbec9e897797d12cf551d0 cdlabelgen-2.4.0.ebuild 709
-MD5 37ed5dba873e5152a8c26cdd7550b55c cdlabelgen-2.6.1.ebuild 955
-MD5 a4c0eff5fb6ebc735ac649e806dade11 cdlabelgen-3.0.0.ebuild 946
-MD5 0f163cb5189b62046f2023c0a5c8e20d ChangeLog 3098
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c9e6060df52e15c188c54eb8567c70d1 cdlabelgen-3.0.0.ebuild 946
+MD5 0cc84bee8c855192d23c0d1c8cb1e3e9 ChangeLog 3461
 MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
 MD5 d75580264ce32b04d4755d221050f8a3 cdlabelgen-3.5.0.ebuild 1023
-MD5 856cfdea5f6e8201ccb75b8020754335 files/makefile.patch-2.4.0 1088
-MD5 08f43be319a72950784c25dc90ce1f16 files/makefile.patch-2.6.0 1050
-MD5 17b8da696651580c3b9eac7f96c1611c files/makefile.patch-2.6.1 1188
-MD5 bff2b23835a3572047c6661e88129d75 files/makefile.patch 927
-MD5 f5f68a6ca5f9f6ff5324d33fcaa46ace files/digest-cdlabelgen-2.3.0 65
-MD5 b340cb1f3df8fdb267d0bbdafbd5e930 files/digest-cdlabelgen-2.4.0 65
-MD5 4c59844d493acdc0cb186eb6d7367d59 files/digest-cdlabelgen-2.6.0 65
-MD5 64d64c0016fce9b8b191507dee623d23 files/digest-cdlabelgen-2.6.1 65
 MD5 7ae5079af09947e1f62b692d15814a50 files/digest-cdlabelgen-3.0.0 65
 MD5 9a1d3d70de160e0f035badcdd3687ace files/digest-cdlabelgen-3.5.0 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtHudV3J2n04EauwRAkWlAKC5TUwTWU960t5i7S+vjn95Qq4IwgCaA1IT
+kCitU/CeVa1ptUjfdQ0GusU=
+=14o3
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdlabelgen/cdlabelgen-2.3.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-2.3.0.ebuild
deleted file mode 100644
index 6bc14e2aac9c..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-2.3.0.ebuild
+++ /dev/null
@@ -1,25 +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/cdlabelgen/cdlabelgen-2.3.0.ebuild,v 1.15 2005/01/01 12:09:31 eradicator Exp $
-
-DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="http://www.aczone.com/tools/cdinsert"
-SRC_URI="http://www.aczone.com/pub/tools/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.1"
-DEPEND="app-arch/tar
-	app-arch/gzip"
-
-src_compile() {
-	patch -p0 -i ${FILESDIR}/makefile.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	dodoc README INSTALL.WEB *.spec cdinsert.pl
-	dohtml *.html
-}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-2.4.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-2.4.0.ebuild
deleted file mode 100644
index a9142394627e..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-2.4.0.ebuild
+++ /dev/null
@@ -1,26 +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/cdlabelgen/cdlabelgen-2.4.0.ebuild,v 1.13 2005/01/01 12:09:31 eradicator Exp $
-
-DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="http://www.aczone.com/tools/cdinsert"
-SRC_URI="http://www.aczone.com/pub/tools/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.1"
-DEPEND="app-arch/tar
-	app-arch/gzip"
-
-src_compile() {
-	patch -p1 -i ${FILESDIR}/makefile.patch-2.4.0
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	dodoc README INSTALL.WEB *.spec cdinsert.pl
-	dohtml *.html
-}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild
deleted file mode 100644
index e489870aa1ad..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild
+++ /dev/null
@@ -1,25 +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/cdlabelgen/cdlabelgen-2.6.0.ebuild,v 1.8 2005/01/01 12:09:31 eradicator Exp $
-
-DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="http://www.aczone.com/tools/cdinsert"
-SRC_URI="http://www.aczone.com/pub/tools/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.1"
-DEPEND="app-arch/tar
-	app-arch/gzip"
-
-src_compile() {
-	patch -p1 -i ${FILESDIR}/makefile.patch-2.6.0
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install problem"
-	dodoc README INSTALL.WEB *.spec cdinsert.pl
-	dohtml *.html
-}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-2.6.1.ebuild b/app-cdr/cdlabelgen/cdlabelgen-2.6.1.ebuild
deleted file mode 100644
index 81e0fba4d0f5..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-2.6.1.ebuild
+++ /dev/null
@@ -1,33 +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/cdlabelgen/cdlabelgen-2.6.1.ebuild,v 1.11 2005/01/01 12:09:31 eradicator Exp $
-
-DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="http://www.aczone.com/tools/cdinsert"
-SRC_URI="http://www.aczone.com/pub/tools/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.1"
-DEPEND="app-arch/tar
-	>=sys-apps/sed-4
-	app-arch/gzip"
-
-src_compile() {
-	sed -i \
-		-e "s:BASE_DIR   = /usr/local:BASE_DIR   = ${D}/usr:g" \
-		-e "s:LIB_DIR   = \$(BASE_DIR)/lib/cdlabelgen:LIB_DIR   = \$(BASE_DIR)/share/cdlabelgen:g" \
-		-e "s:\$(INSTALL) cdlabelgen.1 \$(MAN_DIR)/man1::g" \
-			Makefile || \
-				die "sed Makefile failed"
-
-}
-
-src_install() {
-	make install || die "make install failed"
-	dodoc README INSTALL.WEB *.spec cdinsert.pl
-	dohtml *.html
-	doman cdlabelgen.1
-}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild
index 0932ad18a93b..68915e070e8d 100644
--- a/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild
+++ b/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild,v 1.12 2005/01/01 12:09:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild,v 1.13 2005/06/18 19:53:21 tove Exp $
 
 DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="http://www.aczone.com/tools/cdinsert"
-SRC_URI="http://www.aczone.com/pub/tools/${P}.tgz"
+HOMEPAGE="http://www.aczoom.com/tools/cdinsert"
+SRC_URI="http://www.aczoom.com/pub/tools/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.3.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.3.0
deleted file mode 100644
index ee61b718abe2..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11cfcd47a91316e3e6fba347d74142e3 cdlabelgen-2.3.0.tgz 126656
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.4.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.4.0
deleted file mode 100644
index deb0f6ab0d1c..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3faa2057ccaa05df7475c9381bb6452b cdlabelgen-2.4.0.tgz 128966
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.0
deleted file mode 100644
index 335f8bb5fa76..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33177cf123ed5d74326a4a8c25378f26 cdlabelgen-2.6.0.tgz 170319
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.1 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.1
deleted file mode 100644
index 423ccfe84c6a..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8877d0f0da1e1226cc658358ab5b77d cdlabelgen-2.6.1.tgz 176913
diff --git a/app-cdr/cdlabelgen/files/makefile.patch b/app-cdr/cdlabelgen/files/makefile.patch
deleted file mode 100644
index e502102145d1..000000000000
--- a/app-cdr/cdlabelgen/files/makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile~	Sun Jul 21 19:39:01 2002
-+++ Makefile	Sun Jul 21 19:41:02 2002
-@@ -8,9 +8,9 @@
- # Change these to locations you need, also
- # remember to edit cdlabelgen and its @where_is_the_template as needed.
- 
--BASE_DIR   = /usr/local
-+BASE_DIR   = $(DESTDIR)/usr
- BIN_DIR   = $(BASE_DIR)/bin
--LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
-+LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile cdinsert.pl INSTALL.WEB cdlabelgen.html cdlabelgen$(VERSION).spec
- POSTSCRIPT = template.ps *.eps
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -37,7 +37,7 @@
- 	for file in $(POSTSCRIPT); do \
- 		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
- 	done
--	echo "** Done. Be sure to edit $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
-+#	echo "** Done. Be sure to edit $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
- 
- dist: all
- 	rm -rf cdlabelgen$(VERSION)
diff --git a/app-cdr/cdlabelgen/files/makefile.patch-2.4.0 b/app-cdr/cdlabelgen/files/makefile.patch-2.4.0
deleted file mode 100644
index e0275274d7f2..000000000000
--- a/app-cdr/cdlabelgen/files/makefile.patch-2.4.0
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN cdlabelgen-2.4.0/Makefile cdlabelgen-2.4.0.patched/Makefile
---- cdlabelgen-2.4.0/Makefile	Tue Jul 30 18:45:51 2002
-+++ cdlabelgen-2.4.0.patched/Makefile	Fri Aug  2 22:35:08 2002
-@@ -8,11 +8,11 @@
- # Change these to locations you need, also
- # remember to edit cdlabelgen and its @where_is_the_template as needed.
- 
--BASE_DIR   = /usr/local
-+BASE_DIR   = $(DESTDIR)/usr
- # BASE_DIR   = /usr/local
- # BASE_DIR   = /opt
- BIN_DIR   = $(BASE_DIR)/bin
--LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
-+LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile cdinsert.pl INSTALL.WEB cdlabelgen.html cdlabelgen$(VERSION).spec
- POSTSCRIPT = template.ps *.eps
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -39,7 +39,7 @@
- 	for file in $(POSTSCRIPT); do \
- 		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
- 	done
--	echo "** Done. Be sure to edit $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
-+#	echo "** Done. Be sure to edit $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
- 
- dist: all
- 	rm -rf cdlabelgen$(VERSION)
diff --git a/app-cdr/cdlabelgen/files/makefile.patch-2.6.0 b/app-cdr/cdlabelgen/files/makefile.patch-2.6.0
deleted file mode 100644
index 4a91429a8272..000000000000
--- a/app-cdr/cdlabelgen/files/makefile.patch-2.6.0
+++ /dev/null
@@ -1,28 +0,0 @@
---- cdlabelgen-2.6.0/Makefile	2003-05-13 11:16:49.000000000 +1200
-+++ cdlabelgen-2.6.0.patched/Makefile	2003-06-19 13:01:29.000000000 +1200
-@@ -8,12 +8,12 @@
- # Change these to locations you need, also
- # remember to edit cdlabelgen and its @where_is_the_template as needed.
- 
--BASE_DIR   = /usr/local
-+BASE_DIR   = $(DESTDIR)/usr
- # BASE_DIR   = /usr/local
- # BASE_DIR   = /opt
- BIN_DIR   = $(BASE_DIR)/bin
--LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
--MAN_DIR   = $(BASE_DIR)/man
-+LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
-+MAN_DIR   = $(BASE_DIR)/share/man
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile cdinsert.pl INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html cdlabelgen$(VERSION).spec
- POSTSCRIPT = template.ps *.eps
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -45,7 +45,8 @@
- 	@echo ""
- 	$(INSTALL_DIR) $(BIN_DIR)
- 	$(INSTALL) cdlabelgen $(BIN_DIR)
--	$(INSTALL) cdlabelgen.1 $(MAN_DIR)/man1
-+	$(INSTALL_DIR) $(MAN_DIR)
-+	$(INSTALL) cdlabelgen.1 $(MAN_DIR)
- 	$(INSTALL_DIR) $(LIB_DIR)
- 	set -e; \
- 	for file in $(POSTSCRIPT); do \
diff --git a/app-cdr/cdlabelgen/files/makefile.patch-2.6.1 b/app-cdr/cdlabelgen/files/makefile.patch-2.6.1
deleted file mode 100644
index 1aba8650e6e7..000000000000
--- a/app-cdr/cdlabelgen/files/makefile.patch-2.6.1
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur cdlabelgen-2.6.1.old/Makefile cdlabelgen-2.6.1/Makefile
---- cdlabelgen-2.6.1.old/Makefile	2003-09-12 18:16:54.000000000 +0000
-+++ cdlabelgen-2.6.1/Makefile	2003-09-16 18:53:12.000000000 +0000
-@@ -8,12 +8,12 @@
- # Change these to locations you need, also
- # remember to edit cdlabelgen and its @where_is_the_template as needed.
- 
--BASE_DIR   = /usr/local
-+#BASE_DIR   = /usr/local
- # BASE_DIR   = /usr/local
--# BASE_DIR   = /opt
-+BASE_DIR   = $(DESTDIR)/usr
- BIN_DIR   = $(BASE_DIR)/bin
--LIB_DIR   = $(BASE_DIR)/lib/cdlabelgen
--MAN_DIR   = $(BASE_DIR)/man
-+LIB_DIR   = $(BASE_DIR)/share/cdlabelgen
-+MAN_DIR   = $(BASE_DIR)/share/man
- SOURCES    = cdlabelgen ChangeLog INSTALL README Makefile cdinsert.pl INSTALL.WEB cdlabelgen.pod cdlabelgen.1 cdlabelgen.html spec.template
- POSTSCRIPT = template.ps *.eps
- DISTFILES = $(SOURCES) $(POSTSCRIPT)
-@@ -44,8 +44,8 @@
- 	@echo "Installing cdlabelgen in $(BIN_DIR) and $(LIB_DIR)"
- 	@echo ""
- 	$(INSTALL_DIR) $(BIN_DIR)
--	$(INSTALL) cdlabelgen $(BIN_DIR)
--	$(INSTALL) cdlabelgen.1 $(MAN_DIR)/man1
-+	$(INSTALL_DIR) $(MAN_DIR)
-+	$(INSTALL) cdlabelgen.1 $(MAN_DIR)
- 	$(INSTALL_DIR) $(LIB_DIR)
- 	set -e; \
- 	for file in $(POSTSCRIPT); do \