Resolved bugs #84227, #84731, #75279

Package-Manager: portage-2.0.51.19

7 files changed, 68 insertions, 25 deletions

diff --git a/app-cdr/cdrecord-prodvd/ChangeLog b/app-cdr/cdrecord-prodvd/ChangeLog
index 279a5ff40a57..d9600616ee7c 100644
--- a/app-cdr/cdrecord-prodvd/ChangeLog
+++ b/app-cdr/cdrecord-prodvd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-cdr/cdrecord-prodvd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/ChangeLog,v 1.15 2005/02/26 11:36:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/ChangeLog,v 1.16 2005/03/29 22:48:14 pylon Exp $
+
+*cdrecord-prodvd-2.01.01-r1 (29 Mar 2005)
+*cdrecord-prodvd-2.01_pre20041012 (29 Mar 2005)
+
+  29 Mar 2005; Lars Weiler <pylon@gentoo.org>
+  +cdrecord-prodvd-2.01_pre20041012.ebuild, -cdrecord-prodvd-2.01.01.ebuild,
+  +cdrecord-prodvd-2.01.01-r1.ebuild:
+  Revision bump, so that the new cdrecord-wrapper.sh with the new key will be
+  installed -> bug #84227
+  Added a separate version for amd64, so that it contains the correct version
+  number -> bug #84731
+  Changed the LICENSE statement -> bug #75279
 
   26 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   files/cdrecord-wrapper.sh:
diff --git a/app-cdr/cdrecord-prodvd/Manifest b/app-cdr/cdrecord-prodvd/Manifest
index efadfcc70de1..a6b5671577c1 100644
--- a/app-cdr/cdrecord-prodvd/Manifest
+++ b/app-cdr/cdrecord-prodvd/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b468a983495da383b0790b6d27059bf ChangeLog 2471
-MD5 48ca404401bb6907e8e7e0e70ce3a690 cdrecord-prodvd-2.01_beta31.ebuild 1144
+MD5 65465924d08f8cac20028f22d6cf1108 cdrecord-prodvd-2.01_beta31.ebuild 1146
 MD5 bca2ecf18b913eeb713049629869c429 metadata.xml 323
-MD5 5fd4c7d900ee21c276ce52b5b8cf47dc cdrecord-prodvd-2.01.01.ebuild 1157
-MD5 582eee47fac258556c9594d7b296c6ab files/cdrecord-wrapper.sh 472
+MD5 f3ad44cba1ff80ed443655161a01a1e3 cdrecord-prodvd-2.01.01-r1.ebuild 1017
+MD5 a5c43cd163622446ffb92e2e644b0902 cdrecord-prodvd-2.01_pre20041012.ebuild 1048
+MD5 fc6c3499af6ef785ba9140c5ae18f7aa ChangeLog 2970
 MD5 998700ef51321a1dcbfc6c0ec2333356 files/digest-cdrecord-prodvd-2.01_beta31 86
-MD5 b634591137522e7730456a726a32c008 files/digest-cdrecord-prodvd-2.01.01 86
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCIGDkArHZZzCEUG0RAmvOAJ0VhVrjW3zcVlpYtbJJpY/VIA5C0gCgiSSB
-3o8753o8Er90+jIvdehDGUg=
-=E7NK
------END PGP SIGNATURE-----
+MD5 582eee47fac258556c9594d7b296c6ab files/cdrecord-wrapper.sh 472
+MD5 b634591137522e7730456a726a32c008 files/digest-cdrecord-prodvd-2.01.01-r1 86
+MD5 d8f723377218d309c14c765f017b7d90 files/digest-cdrecord-prodvd-2.01_pre20041012 94
diff --git a/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01.ebuild b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01-r1.ebuild
index 1105d1a97376..cdcbd226d6a5 100644
--- a/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01.ebuild
+++ b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01.ebuild,v 1.1 2005/02/04 00:16:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01.01-r1.ebuild,v 1.1 2005/03/29 22:48:14 pylon Exp $
 
 X86_FILENAME="${P}-i686-pc-linux-gnu"
-AMD64_FILENAME="${PN}-2.01-pre-x86_64-unknown-linux-gnu"
 
 DESCRIPTION="Enhancement of cdrecord for writing DVDs"
-HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
-SRC_URI="x86? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${X86_FILENAME} )
-	 amd64? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${X86_FILENAME} )"
+HOMEPAGE="http://ftp.berlios.de/pub/cdrecord/ProDVD/"
+SRC_URI="x86? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${X86_FILENAME} )"
 
-LICENSE="as-is"
+LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~x86"
 IUSE="uclibc"
 
 DEPEND=">=app-cdr/cdrtools-2.01_alpha24
@@ -35,5 +33,6 @@ pkg_postinst() {
 	echo
 	einfo "For a license key of CDrecord-ProDVD please read"
 	einfo "ftp://ftp.berlios.de/pub/cdrecord/ProDVD/README"
+	einfo "or use cdrecord-wrapper.sh"
 	echo
 }
diff --git a/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.ebuild b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.ebuild
index d659a65006cb..b9c322d878cb 100644
--- a/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.ebuild
+++ b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.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/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.ebuild,v 1.5 2005/01/01 12:10:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_beta31.ebuild,v 1.6 2005/03/29 22:48:14 pylon Exp $
 
 X86_FILENAME="cdrecord-prodvd-2.01b31-i686-pc-linux-gnu"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/pr
 SRC_URI="x86? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${X86_FILENAME} )
 	 amd64? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${X86_FILENAME} )"
 
-LICENSE="as-is"
+LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="x86 ~amd64 -ppc -sparc -mips -alpha"
 IUSE="uclibc"
diff --git a/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_pre20041012.ebuild b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_pre20041012.ebuild
new file mode 100644
index 000000000000..cdf31f268e51
--- /dev/null
+++ b/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_pre20041012.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrecord-prodvd/cdrecord-prodvd-2.01_pre20041012.ebuild,v 1.1 2005/03/29 22:48:14 pylon Exp $
+
+AMD64_FILENAME="${PN}-2.01-pre-x86_64-unknown-linux-gnu"
+
+DESCRIPTION="Enhancement of cdrecord for writing DVDs"
+HOMEPAGE="http://ftp.berlios.de/pub/cdrecord/ProDVD/"
+SRC_URI="amd64? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/${AMD64_FILENAME} )"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="uclibc"
+
+DEPEND=">=app-cdr/cdrtools-2.01_alpha24
+	!uclibc? ( sys-libs/glibc )"
+
+S=${WORKDIR}
+
+src_unpack() {
+	use uclibc && die "binary package not compatible with uclibc"
+	cp ${DISTDIR}/${A} ${WORKDIR}/
+}
+
+src_install() {
+	dobin ${A}
+	dosym ${A} /usr/bin/cdrecord-ProDVD
+	dobin ${FILESDIR}/cdrecord-wrapper.sh
+}
+
+pkg_postinst() {
+	echo
+	einfo "For a license key of CDrecord-ProDVD please read"
+	einfo "ftp://ftp.berlios.de/pub/cdrecord/ProDVD/README"
+	einfo "or use cdrecord-wrapper.sh"
+	echo
+}
diff --git a/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01.01-r1 b/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01.01-r1
new file mode 100644
index 000000000000..d3425f7170ba
--- /dev/null
+++ b/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01.01-r1
@@ -0,0 +1 @@
+MD5 bfb071c2c3e7800d4044ac58b9e3c9ca cdrecord-prodvd-2.01.01-i686-pc-linux-gnu 376924
diff --git a/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01_pre20041012 b/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01_pre20041012
new file mode 100644
index 000000000000..f10c42069299
--- /dev/null
+++ b/app-cdr/cdrecord-prodvd/files/digest-cdrecord-prodvd-2.01_pre20041012
@@ -0,0 +1 @@
+MD5 ba265a8d6bf0984200ce9fafafc453c8 cdrecord-prodvd-2.01-pre-x86_64-unknown-linux-gnu 418224