Clean up old broken ebuilds and make sure we actually install version 0.2 as pointed out by Sascha Geschwandtner in #118850.

(Portage version: 2.1_pre3-r1)

7 files changed, 40 insertions, 50 deletions

diff --git a/app-cdr/ccd2iso/ChangeLog b/app-cdr/ccd2iso/ChangeLog
index 7053ae89599b..36999005ae2b 100644
--- a/app-cdr/ccd2iso/ChangeLog
+++ b/app-cdr/ccd2iso/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/ccd2iso
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ChangeLog,v 1.8 2005/04/21 17:52:09 blubb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ChangeLog,v 1.9 2006/01/13 09:11:54 vapier Exp $
+
+*ccd2iso-0.2-r1 (13 Jan 2006)
+
+  13 Jan 2006; Mike Frysinger <vapier@gentoo.org> -ccd2iso-0.1.ebuild,
+  -ccd2iso-0.2.ebuild, +ccd2iso-0.2-r1.ebuild:
+  Clean up old broken ebuilds and make sure we actually install version 0.2 as
+  pointed out by Sascha Geschwandtner in #118850.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> ccd2iso-0.1.ebuild:
   stable on amd64
diff --git a/app-cdr/ccd2iso/ccd2iso-0.1.ebuild b/app-cdr/ccd2iso/ccd2iso-0.1.ebuild
deleted file mode 100644
index 85f96da36752..000000000000
--- a/app-cdr/ccd2iso/ccd2iso-0.1.ebuild
+++ /dev/null
@@ -1,23 +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/ccd2iso/ccd2iso-0.1.ebuild,v 1.11 2005/04/21 17:52:09 blubb Exp $
-
-DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
-HOMEPAGE="http://sourceforge.net/projects/ccd2iso/"
-SRC_URI="mirror://sourceforge/ccd2iso/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="x86 ppc amd64 ~ppc-macos"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-cdr/ccd2iso/ccd2iso-0.2-r1.ebuild b/app-cdr/ccd2iso/ccd2iso-0.2-r1.ebuild
new file mode 100644
index 000000000000..574a5739b97c
--- /dev/null
+++ b/app-cdr/ccd2iso/ccd2iso-0.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/ccd2iso/ccd2iso-0.2-r1.ebuild,v 1.1 2006/01/13 09:11:54 vapier Exp $
+
+inherit autotools
+
+DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
+HOMEPAGE="http://sourceforge.net/projects/ccd2iso/"
+SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc-macos x86"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bundled autotools are all screwed up
+	eautoreconf
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-cdr/ccd2iso/ccd2iso-0.2.ebuild b/app-cdr/ccd2iso/ccd2iso-0.2.ebuild
deleted file mode 100644
index 41e21d5300fc..000000000000
--- a/app-cdr/ccd2iso/ccd2iso-0.2.ebuild
+++ /dev/null
@@ -1,23 +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/ccd2iso/ccd2iso-0.2.ebuild,v 1.1 2005/04/19 22:05:43 pylon Exp $
-
-DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
-HOMEPAGE="http://sourceforge.net/projects/ccd2iso/"
-SRC_URI="mirror://sourceforge/ccd2iso/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc-macos"
-
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-cdr/ccd2iso/files/digest-ccd2iso-0.1 b/app-cdr/ccd2iso/files/digest-ccd2iso-0.1
deleted file mode 100644
index 1391607f687c..000000000000
--- a/app-cdr/ccd2iso/files/digest-ccd2iso-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a478f2309608593035f1a095a616bd5 ccd2iso.tar.gz 540276
diff --git a/app-cdr/ccd2iso/files/digest-ccd2iso-0.2 b/app-cdr/ccd2iso/files/digest-ccd2iso-0.2
deleted file mode 100644
index 1391607f687c..000000000000
--- a/app-cdr/ccd2iso/files/digest-ccd2iso-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a478f2309608593035f1a095a616bd5 ccd2iso.tar.gz 540276
diff --git a/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r1 b/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r1
new file mode 100644
index 000000000000..56beebdc6010
--- /dev/null
+++ b/app-cdr/ccd2iso/files/digest-ccd2iso-0.2-r1
@@ -0,0 +1 @@
+MD5 f53def956f937d5ef8fc3e89ff3e22c8 ccd2iso-0.2.tar.gz 179670