gimp-print -> gutenprint, remove old ebuild

(Portage version: 2.1.4.4)

4 files changed, 10 insertions, 64 deletions

diff --git a/media-video/cinepaint/ChangeLog b/media-video/cinepaint/ChangeLog
index fb57f15c9c09..7122282f5cf3 100644
--- a/media-video/cinepaint/ChangeLog
+++ b/media-video/cinepaint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinepaint
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.20 2008/03/25 22:54:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.21 2008/04/05 13:46:55 genstef Exp $
+
+  05 Apr 2008; Stefan Schweizer <genstef@gentoo.org>
+  -files/cinepaint-0.22.0-as-needed.patch, -cinepaint-0.22.0.ebuild,
+  cinepaint-0.22.1.ebuild:
+  gimp-print -> gutenprint, remove old ebuild
 
   25 Mar 2008; Alexis Ballier <aballier@gentoo.org> cinepaint-0.22.1.ebuild:
   Add a check for fltk built with opengl useflag, bug #190814
diff --git a/media-video/cinepaint/cinepaint-0.22.0.ebuild b/media-video/cinepaint/cinepaint-0.22.0.ebuild
deleted file mode 100644
index 2e800d673552..000000000000
--- a/media-video/cinepaint/cinepaint-0.22.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.22.0.ebuild,v 1.3 2008/03/25 22:12:48 aballier Exp $
-
-inherit eutils versionator flag-o-matic
-
-MY_PV=$(replace_version_separator 2 '-')
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="motion picture editing tool used for painting and retouching of movies"
-SRC_URI="mirror://sourceforge/cinepaint/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://cinepaint.sourceforge.net/"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-IUSE="gimpprint png zlib"
-
-RDEPEND=">=x11-libs/gtk+-2.0
-	png? ( >=media-libs/libpng-1.2 )
-	zlib? ( sys-libs/zlib )
-	gimpprint? ( >=media-gfx/gimp-print-5.0.0 )
-	media-libs/openexr
-	>=media-libs/lcms-1.16
-	media-libs/tiff
-	media-libs/jpeg
-	x11-libs/fltk
-	x11-libs/libXmu
-	x11-libs/libXinerama
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xineramaproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_compile(){
-	econf $(use_enable gimpprint print) --enable-gtk2 || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install(){
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/media-video/cinepaint/cinepaint-0.22.1.ebuild b/media-video/cinepaint/cinepaint-0.22.1.ebuild
index d6bdff5f9bfb..bc6bfdb620a4 100644
--- a/media-video/cinepaint/cinepaint-0.22.1.ebuild
+++ b/media-video/cinepaint/cinepaint-0.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.22.1.ebuild,v 1.2 2008/03/25 22:54:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.22.1.ebuild,v 1.3 2008/04/05 13:46:55 genstef Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -12,12 +12,12 @@ HOMEPAGE="http://cinepaint.sourceforge.net/"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
-IUSE="gimpprint png zlib"
+IUSE="gutenprint png zlib"
 
 RDEPEND=">=x11-libs/gtk+-2.0
 	png? ( >=media-libs/libpng-1.2 )
 	zlib? ( sys-libs/zlib )
-	gimpprint? ( >=media-gfx/gimp-print-5.0.0 )
+	gutenprint? ( >=net-print/gutenprint-5.0.0 )
 	media-libs/openexr
 	>=media-libs/lcms-1.16
 	media-libs/tiff
@@ -38,7 +38,7 @@ pkg_setup() {
 }
 
 src_compile(){
-	econf $(use_enable gimpprint print) --enable-gtk2 || die "econf failed"
+	econf $(use_enable gutenprint print) --enable-gtk2 || die "econf failed"
 	emake || die "emake failed"
 }
 
diff --git a/media-video/cinepaint/files/cinepaint-0.22.0-as-needed.patch b/media-video/cinepaint/files/cinepaint-0.22.0-as-needed.patch
deleted file mode 100644
index 6dbbdd5cb719..000000000000
--- a/media-video/cinepaint/files/cinepaint-0.22.0-as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: cinepaint-0.22-0/lib/Makefile.in
-===================================================================
---- cinepaint-0.22-0.orig/lib/Makefile.in
-+++ cinepaint-0.22-0/lib/Makefile.in
-@@ -299,6 +299,7 @@ EXTRA_DIST = version.h.in
- lib_LTLIBRARIES = libcinepaint.la 
- libcinepaint_la_LIBADD = \
- 	./wire/libwire.la \
-+	$(GTK_LIBS) \
- 	$(top_builddir)/libhalf/libcinepaintHalf.la
- 
- libcinepaint_la_SOURCES = \