6 files changed, 8 insertions, 262 deletions
diff --git a/media-gfx/gimp-print/Manifest b/media-gfx/gimp-print/Manifest
index d079c85471e5..a0bcf380214f 100644
--- a/media-gfx/gimp-print/Manifest
+++ b/media-gfx/gimp-print/Manifest
@@ -2,35 +2,20 @@ AUX gimp-print-4.2.7-asneeded.patch 1632 RMD160 b67ce5afee6b944229a4b33e4630a664
 MD5 a05ec877703c18041a47316cc21318c0 files/gimp-print-4.2.7-asneeded.patch 1632
 RMD160 b67ce5afee6b944229a4b33e4630a66451df4eab files/gimp-print-4.2.7-asneeded.patch 1632
 SHA256 ce30ce227e6a5b605a0b25f695e69c6fb680d30fae3f4f2d9be40ab6b5dfb134 files/gimp-print-4.2.7-asneeded.patch 1632
-AUX gutenprint-5.0.0-rc2-asneeded.patch 1923 RMD160 d047cb3e6839cb57c28a603bd1c6227dda4a7da9 SHA1 5219311d1aa3da83d257d2923cf8123fb0b807c0 SHA256 39afdbcd0abba35db991331d6c208d23f6c130a0f4c7dc32b4b76b8de8cc68ca
-MD5 a4008ff715378b9dc53d13898ef7c236 files/gutenprint-5.0.0-rc2-asneeded.patch 1923
-RMD160 d047cb3e6839cb57c28a603bd1c6227dda4a7da9 files/gutenprint-5.0.0-rc2-asneeded.patch 1923
-SHA256 39afdbcd0abba35db991331d6c208d23f6c130a0f4c7dc32b4b76b8de8cc68ca files/gutenprint-5.0.0-rc2-asneeded.patch 1923
 DIST gimp-print-4.2.7.tar.gz 5178122 RMD160 b517b1d3cff22347053c634ed96202588d93b63e SHA256 a6cfcbb4bf32d12a553252b98e6a6fdb5d44fe37debad4480bbc9326e2c69489
-DIST gutenprint-5.0.0-rc2-m4-2.patch.bz2 4496 RMD160 d93e15d05acd11654581535758bae990d7b6355e SHA256 304735441ccb41f926fced1ca06596004a346a0938458aec5f639d94158f003a
-DIST gutenprint-5.0.0-rc2.tar.bz2 4075898 RMD160 7045f7fd16822692992ddfd50c08bc3e4ccd4815 SHA256 6affc101116a20574e6dc148b72959a5601e96ae603ed287342677a7115fdf7b
-DIST gutenprint-5.0.0-rc3.tar.bz2 4337134 RMD160 316d7f000899e1487cbc67646e4aed670ae896b3 SHA1 5a1f772873e5d390334e48a8bd6d306c41d62f53 SHA256 3ef4ca66c58f1f3043efd9781f6930aec157847225a706bb46f3501a1f681f39
 DIST gutenprint-5.0.0.tar.bz2 4612717 RMD160 e3f2975cf1a23827b49be5608433d427a94558fb SHA1 ab45fed987b7ab1ec6a19e15d7d14ba9a414b622 SHA256 78a5326341f95a584e4d98b7dad7a56fb763211ecfc07f603af6336fa94d07a3
 EBUILD gimp-print-4.2.7.ebuild 2393 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 SHA1 7cfa03c83371240ff566360de8ae9d7f9ca14473 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7
 MD5 e2687cb0f337cb6ce6f53f2dd2dc47b8 gimp-print-4.2.7.ebuild 2393
 RMD160 95f01a98cfa4bb6914388918e9bbf74a9c0cfc76 gimp-print-4.2.7.ebuild 2393
 SHA256 020acccead6024af8af7ff777b1933ffc6110547882217d11b2762f2b80d4ba7 gimp-print-4.2.7.ebuild 2393
-EBUILD gimp-print-5.0.0.ebuild 2395 RMD160 de1ba91d5cf556f7e84d7106968bb9f757f161b6 SHA1 689bda8fad4e1eb77a949e5f29188b8728b83593 SHA256 b208d9a487869fc7e62308df0ef157371dab8e693ea03fd0c7f1199a39cf7bf6
-MD5 32a9f73e9fa0180e617b247d794b0207 gimp-print-5.0.0.ebuild 2395
-RMD160 de1ba91d5cf556f7e84d7106968bb9f757f161b6 gimp-print-5.0.0.ebuild 2395
-SHA256 b208d9a487869fc7e62308df0ef157371dab8e693ea03fd0c7f1199a39cf7bf6 gimp-print-5.0.0.ebuild 2395
-EBUILD gimp-print-5.0.0_rc2.ebuild 2642 RMD160 e09bccfbcfeffc7d55e672c144ada68fe83861e2 SHA1 aed09b8b9ac3f13390df5f40d7d8408c383be824 SHA256 10139a4af11fd6362c89c56e31f6b9e43af81c5c5b2106bb176919fc6d62c782
-MD5 8c9135e0e76f962f4b216e99b046f59c gimp-print-5.0.0_rc2.ebuild 2642
-RMD160 e09bccfbcfeffc7d55e672c144ada68fe83861e2 gimp-print-5.0.0_rc2.ebuild 2642
-SHA256 10139a4af11fd6362c89c56e31f6b9e43af81c5c5b2106bb176919fc6d62c782 gimp-print-5.0.0_rc2.ebuild 2642
-EBUILD gimp-print-5.0.0_rc3.ebuild 2399 RMD160 9c054adae673db20ed44b377dc7b2f1380ffad17 SHA1 149b3fbf2590952e1e8f4abccc3401c5ec728583 SHA256 6496b9c6d88a7fe9aad256f28bf18fb956f21e005e916c3a6f2fd045b3d053f1
-MD5 f01f7de2b4e8fbee0b1babe9d0275f70 gimp-print-5.0.0_rc3.ebuild 2399
-RMD160 9c054adae673db20ed44b377dc7b2f1380ffad17 gimp-print-5.0.0_rc3.ebuild 2399
-SHA256 6496b9c6d88a7fe9aad256f28bf18fb956f21e005e916c3a6f2fd045b3d053f1 gimp-print-5.0.0_rc3.ebuild 2399
-MISC ChangeLog 11266 RMD160 5f19fa3f50c3011eaf66f9fe81bdd4e23a71c634 SHA1 32c9c59b22d2c22c93f6595ea1b720a3a7ba4f7a SHA256 415ec890cee0c144f15ba07c3d4bdd3e19016bc71a8215969971cbefb0161cac
-MD5 21ff4610ae82cede9a37f78f2f12ad87 ChangeLog 11266
-RMD160 5f19fa3f50c3011eaf66f9fe81bdd4e23a71c634 ChangeLog 11266
-SHA256 415ec890cee0c144f15ba07c3d4bdd3e19016bc71a8215969971cbefb0161cac ChangeLog 11266
+EBUILD gimp-print-5.0.0.ebuild 2372 RMD160 ed50cb063dbec74fdd9be43fc5b0ac8bd0238ed8 SHA1 0bc8cc85748f40c4ca99a46797f3a0ab16d4b858 SHA256 8d30d404da34288d833687b6b2fc29202f5c1d9b5882dcdf8feb9a905857f37c
+MD5 e38b1190dd4c613a85dc15d6f6aebe77 gimp-print-5.0.0.ebuild 2372
+RMD160 ed50cb063dbec74fdd9be43fc5b0ac8bd0238ed8 gimp-print-5.0.0.ebuild 2372
+SHA256 8d30d404da34288d833687b6b2fc29202f5c1d9b5882dcdf8feb9a905857f37c gimp-print-5.0.0.ebuild 2372
+MISC ChangeLog 11541 RMD160 a56102d2f933fe3be269f7a6ca33b80c581d64cc SHA1 7986ad4176ca2416cda076590ff0bad5406bb12e SHA256 038e8dfa8c01b42eb28457fbea8720c4d20246c9c2c540743f211da2e69f4157
+MD5 418f1f7199869a8442d28d5e91cb55fd ChangeLog 11541
+RMD160 a56102d2f933fe3be269f7a6ca33b80c581d64cc ChangeLog 11541
+SHA256 038e8dfa8c01b42eb28457fbea8720c4d20246c9c2c540743f211da2e69f4157 ChangeLog 11541
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -41,9 +26,3 @@ SHA256 baad29165ce99523343d5fcdc93a76fb1f715ce911eef710016f415f1fab5958 files/di
 MD5 df272798bbe930a44b6512c384ef07b9 files/digest-gimp-print-5.0.0 256
 RMD160 9cb15f6dff9065a2db2fd96ec88c25849829ac20 files/digest-gimp-print-5.0.0 256
 SHA256 b1a06c7222d9c17a41b978ae926d9ce4d60acceadfaff741f33eaa3ec6616fe6 files/digest-gimp-print-5.0.0 256
-MD5 c61fe9d77b7ec031b2accb2b0bdc915a files/digest-gimp-print-5.0.0_rc2 548
-RMD160 b0695946b50f333f465b415e2e455b58aff4088c files/digest-gimp-print-5.0.0_rc2 548
-SHA256 3cac8d8b884bca0d04a951b4ca82efe242fe5e4fbd5c9ade21a56fd771b820a7 files/digest-gimp-print-5.0.0_rc2 548
-MD5 9ef4ffd28d344dd3e92251417514a7bc files/digest-gimp-print-5.0.0_rc3 268
-RMD160 cea4298311cca17631e74f07854b9c3ff0354b8c files/digest-gimp-print-5.0.0_rc3 268
-SHA256 8e8f15798855cb3a759f102a3ef2ebedf7776475ab09e56fa9766a02940a2e04 files/digest-gimp-print-5.0.0_rc3 268
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2
deleted file mode 100644
index 379d92da8da2..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 721475e85db76640313fad701c14e464 gutenprint-5.0.0-rc2-m4-2.patch.bz2 4496
-RMD160 d93e15d05acd11654581535758bae990d7b6355e gutenprint-5.0.0-rc2-m4-2.patch.bz2 4496
-SHA256 304735441ccb41f926fced1ca06596004a346a0938458aec5f639d94158f003a gutenprint-5.0.0-rc2-m4-2.patch.bz2 4496
-MD5 82850c8fa82fd1b34c9829cc20901613 gutenprint-5.0.0-rc2.tar.bz2 4075898
-RMD160 7045f7fd16822692992ddfd50c08bc3e4ccd4815 gutenprint-5.0.0-rc2.tar.bz2 4075898
-SHA256 6affc101116a20574e6dc148b72959a5601e96ae603ed287342677a7115fdf7b gutenprint-5.0.0-rc2.tar.bz2 4075898
diff --git a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc3 b/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc3
deleted file mode 100644
index c7425258634c..000000000000
--- a/media-gfx/gimp-print/files/digest-gimp-print-5.0.0_rc3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e364c3752f21ee74344c290b92cb0564 gutenprint-5.0.0-rc3.tar.bz2 4337134
-RMD160 316d7f000899e1487cbc67646e4aed670ae896b3 gutenprint-5.0.0-rc3.tar.bz2 4337134
-SHA256 3ef4ca66c58f1f3043efd9781f6930aec157847225a706bb46f3501a1f681f39 gutenprint-5.0.0-rc3.tar.bz2 4337134
diff --git a/media-gfx/gimp-print/files/gutenprint-5.0.0-rc2-asneeded.patch b/media-gfx/gimp-print/files/gutenprint-5.0.0-rc2-asneeded.patch
deleted file mode 100644
index b753c270d872..000000000000
--- a/media-gfx/gimp-print/files/gutenprint-5.0.0-rc2-asneeded.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: gutenprint-5.0.0-rc2/configure.ac
-===================================================================
---- gutenprint-5.0.0-rc2.orig/configure.ac
-+++ gutenprint-5.0.0-rc2/configure.ac
-@@ -701,8 +701,10 @@ AC_CHECK_LIB(ltdl, lt_dlopen, [LTDL_LIBS
- AC_CHECK_LIB(dl, dlopen, [DLOPEN_LIBS="-ldl"])
- 
- AC_CHECK_LIB(m,pow,
--             GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
--             gutenprint_libdeps="${gutenprint_libdeps} -lm")
-+             MATH_LIB="-lm")
-+GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${MATH_LIB}"
-+gutenprint_libdeps="${gutenprint_libdeps} ${MATH_LIB}"
-+AC_SUBST(MATH_LIB)
- 
- STP_CUPS_LIBS
- 
-Index: gutenprint-5.0.0-rc2/src/cups/Makefile.am
-===================================================================
---- gutenprint-5.0.0-rc2.orig/src/cups/Makefile.am
-+++ gutenprint-5.0.0-rc2/src/cups/Makefile.am
-@@ -73,11 +73,11 @@ epson_SOURCES = epson.c
- epson_LDADD = $(CUPS_LIBS)
- 
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c
--cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS)
-+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) $(MATH_LIB)
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c
--rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS)
-+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) $(MATH_LIB)
- rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_builddir)/config.status cups-genppdconfig.in
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild
deleted file mode 100644
index 5dbc2d8754df..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_rc2.ebuild,v 1.6 2006/04/23 09:23:36 flameeyes Exp $
-
-inherit flag-o-matic libtool eutils autotools
-
-IUSE="cups foomaticdb gtk nls readline ppds"
-
-MY_P=gutenprint-${PV/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ppc64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2
-	mirror://gentoo/${MY_P}-m4-2.patch.bz2"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.14 )
-	media-gfx/imagemagick
-	virtual/ghostscript
-	sys-libs/readline
-	gtk? ( x11-libs/gtk+ )
-	dev-lang/perl
-	foomaticdb? ( net-print/foomatic-db-engine )"
-DEPEND="${RDEPEND}
-	gtk? ( dev-util/pkgconfig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-pkg_setup() {
-	if has_version media-gfx/gimp && built_with_use media-gfx/gimp gimpprint; then
-		ewarn "gimpprint is not yet available due to the API Change in version 5.0"
-		ewarn "Please remerge gimp with USE=-gimpprint to avoid collissions"
-		die "gimp with gimpprint USE-flag detected"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${MY_P}-asneeded.patch"
-	epatch "${WORKDIR}/${MY_P}-m4-2.patch"
-
-	# Remove the broken libtool.m4
-	rm ${S}/m4extra/libtool.m4
-
-	AT_M4DIR="m4 m4extra" eautoreconf
-}
-
-src_compile() {
-	elibtoolize --reverse-deps
-
-	if use cups && use ppds; then
-		myconf="${myconf} --enable-cups-ppds --enable-cups-level3-ppds"
-	else
-		myconf="${myconf} --disable-cups-ppds"
-	fi
-
-	use foomaticdb \
-		&& myconf="${myconf} --with-foomatic3" \
-		|| myconf="${myconf} --without-foomatic"
-
-	# --without-translated-ppds enabled \
-	econf \
-		--enable-test \
-		--with-ghostscript \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable gtk lexmarkutil) \
-		$(use_with cups) \
-		$myconf || die "econf failed"
-
-	# IJS Patch
-	sed -i -e "s/<ijs/<ijs\/ijs/g" src/ghost/ijsgutenprint.c || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	make install DESTDIR=${D} || die "make install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		doc/users_guide/users-guide.ps doc/users_guide/users-guide.pdf \
-		${D}/usr/share/gutenprint/doc/gutenprint.pdf
-	dohtml doc/FAQ.html
-	dohtml -r doc/users_guide/html doc/developer/developer-html
-	rm -fR ${D}/usr/share/gutenprint/doc
-}
diff --git a/media-gfx/gimp-print/gimp-print-5.0.0_rc3.ebuild b/media-gfx/gimp-print/gimp-print-5.0.0_rc3.ebuild
deleted file mode 100644
index aaad34096373..000000000000
--- a/media-gfx/gimp-print/gimp-print-5.0.0_rc3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp-print/gimp-print-5.0.0_rc3.ebuild,v 1.3 2006/06/01 18:50:35 genstef Exp $
-
-inherit flag-o-matic eutils libtool
-
-IUSE="cups foomaticdb gtk nls readline ppds"
-
-MY_P=gutenprint-${PV/_/-}
-
-DESCRIPTION="Gimp Print Drivers"
-HOMEPAGE="http://gimp-print.sourceforge.net"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ppc64"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
-
-RDEPEND="cups? ( >=net-print/cups-1.1.14 )
-	media-gfx/imagemagick
-	virtual/ghostscript
-	sys-libs/readline
-	gtk? ( x11-libs/gtk+ )
-	dev-lang/perl
-	foomaticdb? ( net-print/foomatic-db-engine )"
-DEPEND="${RDEPEND}
-	gtk? ( dev-util/pkgconfig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-append-flags -fno-inline-functions
-
-pkg_setup() {
-	if has_version media-gfx/gimp && built_with_use media-gfx/gimp gimpprint; then
-		ewarn "gimpprint is not yet available due to the API Change in version 5.0"
-		ewarn "Please remerge gimp with USE=-gimpprint to avoid collissions"
-		die "gimp with gimpprint USE-flag detected"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	elibtoolize
-}
-
-src_compile() {
-	if use cups && use ppds; then
-		myconf="${myconf} --enable-cups-ppds --enable-cups-level3-ppds"
-	else
-		myconf="${myconf} --disable-cups-ppds"
-	fi
-
-	use foomaticdb \
-		&& myconf="${myconf} --with-foomatic3" \
-		|| myconf="${myconf} --without-foomatic"
-
-	econf \
-		--enable-test \
-		--with-ghostscript \
-		--with-user-guide \
-		--with-samples \
-		--with-escputil \
-		--disable-translated-cups-ppds \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable gtk lexmarkutil) \
-		$(use_with cups) \
-		$myconf || die "econf failed"
-
-	# IJS Patch
-	sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	make install DESTDIR=${D} || die "make install failed"
-
-	exeinto /usr/share/gutenprint
-	doexe test/{unprint,pcl-unprint,bjc-unprint,parse-escp2,escp2-weavetest,run-testdither,run-weavetest,testdither}
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		doc/users_guide/users-guide.ps doc/users_guide/users-guide.pdf \
-		${D}/usr/share/gutenprint/doc/gutenprint.pdf
-	dohtml doc/FAQ.html
-	dohtml -r doc/users_guide/html doc/developer/developer-html
-	rm -fR ${D}/usr/share/gutenprint/doc
-}