Version bump; bug #202283. Cleanup.

(Portage version: 2.1.4_rc10)

7 files changed, 36 insertions, 49 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/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