Version bump; bug #202283. Cleanup.

Package-Manager: portage-2.1.4_rc10

8 files changed, 62 insertions, 69 deletions

diff --git a/app-cdr/cdlabelgen/ChangeLog b/app-cdr/cdlabelgen/ChangeLog
index 2d7283010110..be41ecd386f2 100644
--- a/app-cdr/cdlabelgen/ChangeLog
+++ b/app-cdr/cdlabelgen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdlabelgen
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/ChangeLog,v 1.31 2007/08/25 16:29:31 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/ChangeLog,v 1.32 2007/12/16 15:30:47 pylon Exp $
+
+*cdlabelgen-4.0.0 (16 Dec 2007)
+
+  16 Dec 2007; Lars Weiler <pylon@gentoo.org>
+  +files/4.0.0-create-MAN_DIR.diff, -cdlabelgen-3.0.0.ebuild,
+  -cdlabelgen-3.5.0.ebuild, +cdlabelgen-4.0.0.ebuild:
+  Version bump; bug #202283.  Cleanup.
 
   25 Aug 2007; Steve Dibb <beandog@gentoo.org> cdlabelgen-3.6.0.ebuild:
   amd64 stable
diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
index d8579a24d161..ff21f13c3f8d 100644
--- a/app-cdr/cdlabelgen/Manifest
+++ b/app-cdr/cdlabelgen/Manifest
@@ -1,36 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.6.0-create-MAN_DIR.diff 415 RMD160 f06b8e5052a2376d9395b804a68f601671a2e668 SHA1 22a1f8481dc9a6e248957e65ba8b505665725118 SHA256 5c21b76c839abcf8772144fb4516aba2a96d8a2b00413b8b43c2e388ba09bce2
 MD5 1c48de23e63725d7ce615b2a4dd6ea7e files/3.6.0-create-MAN_DIR.diff 415
 RMD160 f06b8e5052a2376d9395b804a68f601671a2e668 files/3.6.0-create-MAN_DIR.diff 415
 SHA256 5c21b76c839abcf8772144fb4516aba2a96d8a2b00413b8b43c2e388ba09bce2 files/3.6.0-create-MAN_DIR.diff 415
-DIST cdlabelgen-3.0.0.tgz 179216 RMD160 6f5b6a87f888405c9323f58dbe1a7eaa8e4a7ec5 SHA1 4d06d2d2693417d9de02a6d9f6355b97852dad45 SHA256 bbf6cb0229dc31e5a4347b57bafac09f3a5bf73a6c1f5a22299016f673c7cb11
-DIST cdlabelgen-3.5.0.tgz 184880 RMD160 82bb9c83ee16b37f3cfd7122fac22a9fc9bfe397 SHA1 b6b908bc6e66b356a58aa25ffc77f4e7e51a1880 SHA256 2e620e90b406027b28023ad4488d1a4bf7f094174601d872b7928f26f00dca3f
+AUX 4.0.0-create-MAN_DIR.diff 695 RMD160 e7a34140ee6ad8734ac912bd23a63e8ea18ee949 SHA1 f21e541a1561922345f6eb58e915211cc6ac5182 SHA256 65e6e9d26ca22bbd956f0cc032cd151118ae0bc934c7de97ff84428aa595c95f
+MD5 fb446c520f3c8e8a96cd8c1bc4f7a979 files/4.0.0-create-MAN_DIR.diff 695
+RMD160 e7a34140ee6ad8734ac912bd23a63e8ea18ee949 files/4.0.0-create-MAN_DIR.diff 695
+SHA256 65e6e9d26ca22bbd956f0cc032cd151118ae0bc934c7de97ff84428aa595c95f files/4.0.0-create-MAN_DIR.diff 695
 DIST cdlabelgen-3.6.0.tgz 186151 RMD160 fdeb8367741adb18569227f7eed7f88cdcaf1d81 SHA1 5240b375dbd67cc422d7eeaa286b3c03c3ec5805 SHA256 c7cd8ec0fbc033014b50c5d2089886ee6d9aeb71a8641dd2a4f74b9da25b6482
-EBUILD cdlabelgen-3.0.0.ebuild 940 RMD160 b7305d77d781938caffda937ff7f8582f3afd9cb SHA1 956073c1b0f2e5e36f933343088b4ef661563522 SHA256 2e04eed88c57a8a910e7ecbcf4f408a1b7af69fa699a37d7e4c2d06c4937c246
-MD5 5230711abaa00d2ec967fb630b1b76b4 cdlabelgen-3.0.0.ebuild 940
-RMD160 b7305d77d781938caffda937ff7f8582f3afd9cb cdlabelgen-3.0.0.ebuild 940
-SHA256 2e04eed88c57a8a910e7ecbcf4f408a1b7af69fa699a37d7e4c2d06c4937c246 cdlabelgen-3.0.0.ebuild 940
-EBUILD cdlabelgen-3.5.0.ebuild 1023 RMD160 5f6da95757e31233825d72df8fccd8eefa75953b SHA1 475361e7a6ba6bde235951bc20cff5c899ef3aef SHA256 30906b013e6dc3ec01cc184db97b0c9da5ac3cb54b61df3dae2ba5bb3ac2a7ad
-MD5 d75580264ce32b04d4755d221050f8a3 cdlabelgen-3.5.0.ebuild 1023
-RMD160 5f6da95757e31233825d72df8fccd8eefa75953b cdlabelgen-3.5.0.ebuild 1023
-SHA256 30906b013e6dc3ec01cc184db97b0c9da5ac3cb54b61df3dae2ba5bb3ac2a7ad cdlabelgen-3.5.0.ebuild 1023
+DIST cdlabelgen-4.0.0.tgz 191251 RMD160 72983eb0f6df005e31f0bd8f60a035acaa4a6e03 SHA1 689d8bd24bd8a6a4c6ffbb635c680d8d8b604f02 SHA256 ead5392a4310b8f7a3b6ff36a9d9934563dcd354f12d4b25e70f17644c2dd393
 EBUILD cdlabelgen-3.6.0.ebuild 977 RMD160 b64fcb0d10291f0812fdc0f623c5f836b7a1dac9 SHA1 3e57ba1fbfd120698cfbd0589f4a9ab19c9a4baf SHA256 555ee3a8ec570dc56eaf31998e3deb867b6631f7d4c6c05c78c8a6e7ee145230
 MD5 4cc2238049760a0a43b19ed39fc555fc cdlabelgen-3.6.0.ebuild 977
 RMD160 b64fcb0d10291f0812fdc0f623c5f836b7a1dac9 cdlabelgen-3.6.0.ebuild 977
 SHA256 555ee3a8ec570dc56eaf31998e3deb867b6631f7d4c6c05c78c8a6e7ee145230 cdlabelgen-3.6.0.ebuild 977
-MISC ChangeLog 4409 RMD160 e99975ebce4c22e5f54cd86086803a1170ee1c5a SHA1 39816f9e8515805480fe7b0c62678eaf528f58e3 SHA256 b6b2d7c718155e585d9a5d723b327c5a9ee02000b3e0c839ca5b0fced3c778bb
-MD5 f2a10d77f1195a1bcb34a4786b6cb8e7 ChangeLog 4409
-RMD160 e99975ebce4c22e5f54cd86086803a1170ee1c5a ChangeLog 4409
-SHA256 b6b2d7c718155e585d9a5d723b327c5a9ee02000b3e0c839ca5b0fced3c778bb ChangeLog 4409
+EBUILD cdlabelgen-4.0.0.ebuild 755 RMD160 6fa473af4df35e855f58ff085ae58c7d99a0abc8 SHA1 6c841646f33fb7832940f11d46abd7b866123a74 SHA256 0bd1cb25c36ede2825e476bbb32a8c24177283447edb9ccdb928baf0ac508029
+MD5 33b21174c30bafdceec18229e95b1128 cdlabelgen-4.0.0.ebuild 755
+RMD160 6fa473af4df35e855f58ff085ae58c7d99a0abc8 cdlabelgen-4.0.0.ebuild 755
+SHA256 0bd1cb25c36ede2825e476bbb32a8c24177283447edb9ccdb928baf0ac508029 cdlabelgen-4.0.0.ebuild 755
+MISC ChangeLog 4642 RMD160 63c76b2dbaf845ff89b251ba62ab17169eca8543 SHA1 bafac33020fc238cb9fd6a49e0e3f241ebbe79d6 SHA256 4f44d9f86bf6733350fe7d9c12d42212a9b1860e65e6a7353133caa486ac732e
+MD5 d6ee8c698bb9365c4f892b9cdbf3065a ChangeLog 4642
+RMD160 63c76b2dbaf845ff89b251ba62ab17169eca8543 ChangeLog 4642
+SHA256 4f44d9f86bf6733350fe7d9c12d42212a9b1860e65e6a7353133caa486ac732e ChangeLog 4642
 MISC metadata.xml 167 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f SHA1 02a137b11f7f59a2f650c1e85a830acd896d64a8 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2
 MD5 e92c22225408adf0b8a38ee7c440b2cb metadata.xml 167
 RMD160 ab34a00275c75c4522a5fb146a9c6e7d9ca18d7f metadata.xml 167
 SHA256 e63e128685e2c6da2eacfda6e91e700c1eb6f62cc2172ab64eada2ae71431ef2 metadata.xml 167
-MD5 2fad94b5799b8949278c0c2b6f8fd525 files/digest-cdlabelgen-3.0.0 241
-RMD160 609f5a1a8449631b88c91e643d6674e1d930261c files/digest-cdlabelgen-3.0.0 241
-SHA256 89c25df1ae277c4ae9942dd8a0381819cfe0198d37617dd34781476a4044c92c files/digest-cdlabelgen-3.0.0 241
-MD5 9a95ecb835fdedad2bf5b69bf300dcf9 files/digest-cdlabelgen-3.5.0 241
-RMD160 cd122c2ca0402333b47a86e81ee921f367a8d27c files/digest-cdlabelgen-3.5.0 241
-SHA256 96358d216c058cb0a550998d5a88d2d3f568643d0e533c71d6612bd32f1597d6 files/digest-cdlabelgen-3.5.0 241
 MD5 c6b83993df99da60b314a1ee9ac68532 files/digest-cdlabelgen-3.6.0 241
 RMD160 fcf5fb1a189c3b18959b823f15e2cdb5419ad884 files/digest-cdlabelgen-3.6.0 241
 SHA256 826f3658eb96057adea501d9e7acdfeaaf24c2231085337618b5385d98ccf301 files/digest-cdlabelgen-3.6.0 241
+MD5 1fc0d8c9c0adedc2ed18b21b2ba9eec4 files/digest-cdlabelgen-4.0.0 241
+RMD160 d05e11f31ebd98f0472ce80d17474cee74e88f28 files/digest-cdlabelgen-4.0.0 241
+SHA256 9727961ef5930db729f8a23cfa5467a4dd5399fcf6dd29ffaaaf4dde2e550ad4 files/digest-cdlabelgen-4.0.0 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHZUR26IPkARlRZfQRAqbNAJ9i6Hhu54993YhIjDT93a5l1DL9UQCeL51T
+0xkhMRT+C/kCzz6n+XoRdEA=
+=0Ug8
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild
deleted file mode 100644
index 68915e070e8d..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +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-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.aczoom.com/tools/cdinsert"
-SRC_URI="http://www.aczoom.com/pub/tools/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.6.1"
-DEPEND="app-arch/tar
-	app-arch/gzip"
-
-src_compile() {
-	cp Makefile Makefile.bak
-	sed -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.bak > Makefile
-}
-
-src_install() {
-	emake  install || die "install problem"
-	dodoc README INSTALL.WEB *.spec cdinsert.pl
-	dohtml *.html
-
-	doman cdlabelgen.1
-}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-3.5.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild
index 956cc388d43e..3afa567c0aad 100644
--- a/app-cdr/cdlabelgen/cdlabelgen-3.5.0.ebuild
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/cdlabelgen-3.5.0.ebuild,v 1.1 2005/06/18 19:39:33 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild,v 1.1 2007/12/16 15:30:47 pylon Exp $
+
+inherit eutils
 
 DESCRIPTION="CD cover, tray card and envelope generator"
 HOMEPAGE="http://www.aczoom.com/tools/cdinsert"
@@ -10,21 +12,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.6.1"
+RDEPEND="dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-	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 "/\$(INSTALL) cdlabelgen.1 \$(MAN_DIR)\/man1/d" \
-		-e "/fix @where_is_the_template/d" \
-			${S}/Makefile || die "sed failed."
+	epatch "${FILESDIR}"/${PV}-create-MAN_DIR.diff
 }
 
 src_install() {
-	emake  install || die "install problem"
+	emake install BASE_DIR="${D}"/usr || die "emake failed"
 	dodoc ChangeLog README INSTALL.WEB cdinsert.pl || die "dodoc failed."
 	dohtml *.html || die "dohtml failed."
-	doman cdlabelgen.1 || die "doman failed."
 }
diff --git a/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff b/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
new file mode 100644
index 000000000000..54191b2dddd3
--- /dev/null
+++ b/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
@@ -0,0 +1,18 @@
+diff -Naur cdlabelgen-4.0.0.orig/Makefile cdlabelgen-4.0.0/Makefile
+--- cdlabelgen-4.0.0.orig/Makefile	2007-12-16 16:17:22.000000000 +0100
++++ cdlabelgen-4.0.0/Makefile	2007-12-16 16:18:10.000000000 +0100
+@@ -45,13 +45,13 @@
+ 	@echo ""
+ 	$(INSTALL_DIR) $(BIN_DIR)
+ 	$(INSTALL) cdlabelgen $(BIN_DIR)
++	$(INSTALL_DIR) $(MAN_DIR)/man1
+ 	$(INSTALL_FILE) cdlabelgen.1 $(MAN_DIR)/man1
+ 	$(INSTALL_DIR) $(LIB_DIR)
+ 	set -e; \
+ 	for file in $(POSTSCRIPT); do \
+ 		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
+ 	done
+-	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
+ 
+ cdlabelgen-$(VERSION).spec: spec.template
+ 	sed -e "s/TAG_VERSION/$(VERSION)/" < $? > $@
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.0.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.0.0
deleted file mode 100644
index 6bc11f73c15d..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7e5c5464c168dffa2fadfb6d0d36cdb7 cdlabelgen-3.0.0.tgz 179216
-RMD160 6f5b6a87f888405c9323f58dbe1a7eaa8e4a7ec5 cdlabelgen-3.0.0.tgz 179216
-SHA256 bbf6cb0229dc31e5a4347b57bafac09f3a5bf73a6c1f5a22299016f673c7cb11 cdlabelgen-3.0.0.tgz 179216
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.5.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.5.0
deleted file mode 100644
index 97d9e2b9247b..000000000000
--- a/app-cdr/cdlabelgen/files/digest-cdlabelgen-3.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bbe82a25e9eeb66df54ca8f61d561f59 cdlabelgen-3.5.0.tgz 184880
-RMD160 82bb9c83ee16b37f3cfd7122fac22a9fc9bfe397 cdlabelgen-3.5.0.tgz 184880
-SHA256 2e620e90b406027b28023ad4488d1a4bf7f094174601d872b7928f26f00dca3f cdlabelgen-3.5.0.tgz 184880
diff --git a/app-cdr/cdlabelgen/files/digest-cdlabelgen-4.0.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-4.0.0
new file mode 100644
index 000000000000..3e1d9268ffb3
--- /dev/null
+++ b/app-cdr/cdlabelgen/files/digest-cdlabelgen-4.0.0
@@ -0,0 +1,3 @@
+MD5 0b8225fd914b5c7aa1d3e616b1c8accc cdlabelgen-4.0.0.tgz 191251
+RMD160 72983eb0f6df005e31f0bd8f60a035acaa4a6e03 cdlabelgen-4.0.0.tgz 191251
+SHA256 ead5392a4310b8f7a3b6ff36a9d9934563dcd354f12d4b25e70f17644c2dd393 cdlabelgen-4.0.0.tgz 191251