Version bump (bug 418055, thanks teidakankan@gmail.com), remove old.

(Portage version: 2.1.10.63/cvs/Linux x86_64)

4 files changed, 29 insertions, 64 deletions

diff --git a/media-gfx/recoverjpeg/ChangeLog b/media-gfx/recoverjpeg/ChangeLog
index 4a369fc9515e..286dc18eec42 100644
--- a/media-gfx/recoverjpeg/ChangeLog
+++ b/media-gfx/recoverjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/recoverjpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/recoverjpeg/ChangeLog,v 1.7 2012/03/08 15:24:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/recoverjpeg/ChangeLog,v 1.8 2012/05/29 01:17:57 xmw Exp $
+
+*recoverjpeg-2.1.1 (29 May 2012)
+
+  29 May 2012; Michael Weber <xmw@gentoo.org> -recoverjpeg-1.1.4.ebuild,
+  -recoverjpeg-2.0.ebuild, +recoverjpeg-2.1.1.ebuild:
+  Version bump (bug 418055, thanks teidakankan@gmail.com), remove old.
 
   08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   recoverjpeg-2.0-r1.ebuild:
diff --git a/media-gfx/recoverjpeg/recoverjpeg-1.1.4.ebuild b/media-gfx/recoverjpeg/recoverjpeg-1.1.4.ebuild
deleted file mode 100644
index fbb77876574e..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-1.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/recoverjpeg/recoverjpeg-1.1.4.ebuild,v 1.3 2009/10/29 14:27:07 maekke Exp $
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal"
-
-DEPEND=""
-RDEPEND="!minimal? (
-		media-gfx/imagemagick
-		media-gfx/exif
-		dev-lang/python
-	)"
-
-src_install() {
-	if use minimal; then
-		dobin ${PN} || die "cannot install ${PN}"
-		doman ${PN}.1 || die "cannot install manpages"
-	else
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-	dodoc README
-}
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.0.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.0.ebuild
deleted file mode 100644
index 81f55a71c75b..000000000000
--- a/media-gfx/recoverjpeg/recoverjpeg-2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/recoverjpeg/recoverjpeg-2.0.ebuild,v 1.1 2010/03/15 13:30:10 ssuominen Exp $
-
-EAPI=2
-
-DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
-HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg"
-SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-RDEPEND="!minimal? ( media-gfx/exif
-	media-gfx/imagemagick
-	dev-lang/python )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	if use minimal; then
-		dobin recover{jpeg,mov} || die
-		doman recover{jpeg,mov}.1 || die
-	else
-		emake DESTDIR="${D}" install || die
-	fi
-
-	dodoc README
-}
diff --git a/media-gfx/recoverjpeg/recoverjpeg-2.1.1.ebuild b/media-gfx/recoverjpeg/recoverjpeg-2.1.1.ebuild
new file mode 100644
index 000000000000..fa3bf01475de
--- /dev/null
+++ b/media-gfx/recoverjpeg/recoverjpeg-2.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/recoverjpeg/recoverjpeg-2.1.1.ebuild,v 1.1 2012/05/29 01:17:57 xmw Exp $
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="Recover JPEG pictures from a possibly corrupted disk image"
+HOMEPAGE="http://www.rfc1149.net/devel/recoverjpeg"
+SRC_URI="http://www.rfc1149.net/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-gfx/exif
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog )