3 files changed, 5 insertions, 151 deletions
diff --git a/media-gfx/gmic/ChangeLog b/media-gfx/gmic/ChangeLog
index 8a23984577ca..62d6a2c76b3b 100644
--- a/media-gfx/gmic/ChangeLog
+++ b/media-gfx/gmic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gmic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.24 2012/11/02 07:22:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/ChangeLog,v 1.25 2012/11/02 07:25:53 radhermit Exp $
+
+  02 Nov 2012; Tim Harder <radhermit@gentoo.org> -gmic-1.5.1.7.ebuild,
+  -gmic-1.5.1.8.ebuild:
+  Remove old.
 
 *gmic-1.5.2.1 (02 Nov 2012)
 
diff --git a/media-gfx/gmic/gmic-1.5.1.7.ebuild b/media-gfx/gmic/gmic-1.5.1.7.ebuild
deleted file mode 100644
index 4c1e16d8aecf..000000000000
--- a/media-gfx/gmic/gmic-1.5.1.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.7.ebuild,v 1.1 2012/07/26 02:12:13 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0.7-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# Disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}
diff --git a/media-gfx/gmic/gmic-1.5.1.8.ebuild b/media-gfx/gmic/gmic-1.5.1.8.ebuild
deleted file mode 100644
index 72a910978f72..000000000000
--- a/media-gfx/gmic/gmic-1.5.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.5.1.8.ebuild,v 1.1 2012/08/17 04:52:31 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="http://gmic.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz
-	doc? ( http://dev.gentoo.org/~radhermit/dist/gmic_reference-${PV}.pdf.xz )"
-
-LICENSE="CeCILL-2 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ffmpeg fftw graphicsmagick jpeg opencv openexr png tiff X zlib"
-
-RDEPEND="
-	ffmpeg? ( virtual/ffmpeg )
-	fftw? ( sci-libs/fftw:3.0 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg? ( virtual/jpeg )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
-	openexr? (
-		media-libs/ilmbase
-		media-libs/openexr
-	)
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/xz-utils )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.1.7-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0.7-ffmpeg.patch
-
-	for i in ffmpeg fftw jpeg opencv png tiff zlib ; do
-		use $i || { sed -i -r -e "s/^(${i}_(C|LD)FLAGS =).*/\1/I" Makefile || die ; }
-	done
-
-	use graphicsmagick || { sed -i -r -e "s/^(MAGICK_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-	use openexr || { sed -i -r -e "s/^(EXR_(C|LD)FLAGS =).*/\1/" Makefile || die ; }
-
-	if ! use X ; then
-		sed -i -r -e "s/^((X11|XSHM)_(C|LD)FLAGS =).*/\1/" Makefile || die
-
-		# Disable display capabilities when X support is disabled
-		append-cppflags -Dcimg_display=0
-	fi
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" custom lib
-}
-
-src_install() {
-	dobin gmic
-	newlib.so libgmic.so libgmic.so.1
-
-	insinto /usr/include
-	doins gmic.h
-
-	doman ../man/gmic.1.gz
-	dodoc ../README
-
-	use doc && dodoc "${WORKDIR}"/gmic_reference-${PV}.pdf
-
-	newbashcomp gmic_bashcompletion.sh ${PN}
-}