Version bump, Closes #23076

4 files changed, 55 insertions, 2 deletions

diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
index 6d97204a53ca..ddcd7bcbb6d1 100644
--- a/app-cdr/cdlabelgen/Manifest
+++ b/app-cdr/cdlabelgen/Manifest
@@ -1,7 +1,7 @@
-MD5 d5237dfd23c2071d20107ce5c577c2f1 cdlabelgen-2.6.0.ebuild 698
+MD5 e1e245e456757834e9ac88d0eb18162c cdlabelgen-2.6.0.ebuild 693
 MD5 af00795fb0a47d65e4d6939cb633771c cdlabelgen-2.3.0.ebuild 717
 MD5 11d887599f716e8272fec8371f1385d4 cdlabelgen-2.4.0.ebuild 699
-MD5 30e57e190b68a7a8f1ec046bab6e6f76 ChangeLog 1021
+MD5 5a6feac7bc57274cb0679926d5a58c1b ChangeLog 1016
 MD5 856cfdea5f6e8201ccb75b8020754335 files/makefile.patch-2.4.0 1088
 MD5 08f43be319a72950784c25dc90ce1f16 files/makefile.patch-2.6.0 1050
 MD5 bff2b23835a3572047c6661e88129d75 files/makefile.patch 927
diff --git a/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild
new file mode 100644
index 000000000000..e09f2d4e2a74
--- /dev/null
+++ b/app-cdr/cdlabelgen/cdlabelgen-2.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.1 2003/08/27 01:53:11 zul 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"
+
+RDEPEND=">=perl-5.6.1"
+DEPEND="sys-apps/tar
+	sys-apps/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/files/digest-cdlabelgen-2.6.0 b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.0
new file mode 100644
index 000000000000..335f8bb5fa76
--- /dev/null
+++ b/app-cdr/cdlabelgen/files/digest-cdlabelgen-2.6.0
@@ -0,0 +1 @@
+MD5 33177cf123ed5d74326a4a8c25378f26 cdlabelgen-2.6.0.tgz 170319
diff --git a/app-cdr/cdlabelgen/files/makefile.patch-2.6.0 b/app-cdr/cdlabelgen/files/makefile.patch-2.6.0
new file mode 100644
index 000000000000..4a91429a8272
--- /dev/null
+++ b/app-cdr/cdlabelgen/files/makefile.patch-2.6.0
@@ -0,0 +1,28 @@
+--- 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 \