Pull in correct version. Closes #75618.

6 files changed, 50 insertions, 5 deletions

diff --git a/app-cdr/nrg2iso/ChangeLog b/app-cdr/nrg2iso/ChangeLog
index b1677d51425e..eaa2476d8643 100644
--- a/app-cdr/nrg2iso/ChangeLog
+++ b/app-cdr/nrg2iso/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/nrg2iso
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/ChangeLog,v 1.9 2004/10/05 11:22:56 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/ChangeLog,v 1.10 2004/12/25 15:56:54 ticho Exp $
+
+*nrg2iso-0.1 (25 Dec 2004)
+
+  25 Dec 2004; Andrej Kacian <ticho@gentoo.org> +nrg2iso-0.1.ebuild,
+  +nrg2iso-0.4-r1.ebuild, -nrg2iso-0.4.ebuild:
+  Make ~0.4 ebuild pull in actual 0.4 version, instead 0.1. Renamed current
+  0.4 ebuild to 0.1. Closes bug #75618, reported by Janne Liimatainen
+  <jeppe@arabuusimiehet.com>.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   nrg2iso-0.2-r1.ebuild, nrg2iso-0.2.ebuild:
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
index b8a8c73e9a09..2ebab06cc5c9 100644
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@@ -1,4 +1,16 @@
-MD5 92295da3e0504c9753fc9010eb560042 ChangeLog 1197
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0944db3e72b31692c444a8fd5608e8be ChangeLog 1516
+MD5 1bccf346e4fef46ab7cd5d4197b95aef nrg2iso-0.4-r1.ebuild 656
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 b2a5d89cc893ebf5db316ffa4bbff3e7 nrg2iso-0.4.ebuild 668
-MD5 77b18cdbb3edf82609d713940ddf7507 files/digest-nrg2iso-0.4 54
+MD5 3259fc7decbaf7fd9623ddbf1ea2fa46 nrg2iso-0.1.ebuild 667
+MD5 77b18cdbb3edf82609d713940ddf7507 files/digest-nrg2iso-0.1 54
+MD5 0c5c964d812711a66fe191bc1dbf6ebb files/digest-nrg2iso-0.4-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBzY3PQlM6RnzZP+IRAoNDAKCTTsfvqtPcL2yq2mZMjXupcyZJ/wCfS7YK
+1xbkwzjyqEZNuskLFGB4KZo=
+=PNur
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/nrg2iso/files/digest-nrg2iso-0.4 b/app-cdr/nrg2iso/files/digest-nrg2iso-0.1
index f4e89040dae5..f4e89040dae5 100644
--- a/app-cdr/nrg2iso/files/digest-nrg2iso-0.4
+++ b/app-cdr/nrg2iso/files/digest-nrg2iso-0.1
diff --git a/app-cdr/nrg2iso/files/digest-nrg2iso-0.4-r1 b/app-cdr/nrg2iso/files/digest-nrg2iso-0.4-r1
new file mode 100644
index 000000000000..42ceaf868f8e
--- /dev/null
+++ b/app-cdr/nrg2iso/files/digest-nrg2iso-0.4-r1
@@ -0,0 +1 @@
+MD5 996c38c8f1465e9c51ccad4f31ec2eee nrg2iso-0.4.tar.gz 8553
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4.ebuild b/app-cdr/nrg2iso/nrg2iso-0.1.ebuild
index 4e61d6fdf720..931769c900f9 100644
--- a/app-cdr/nrg2iso/nrg2iso-0.4.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/nrg2iso-0.4.ebuild,v 1.2 2004/10/26 13:16:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/nrg2iso-0.1.ebuild,v 1.6 2004/12/25 15:56:54 ticho Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
new file mode 100644
index 000000000000..9076e2450566
--- /dev/null
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild,v 1.1 2004/12/25 15:56:54 ticho Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Converts Nero nrg CD-images to iso"
+HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
+SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -o nrg2iso nrg2iso.c || die "failed to compile"
+}
+
+src_install() {
+	dobin nrg2iso || die
+}