Cleaned versions depending illegally on <libpng-1.4

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 120 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 11be8ef46314..de23f0f0934a 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.16 2010/06/15 12:41:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.17 2010/06/28 19:19:09 jlec Exp $
+
+  28 Jun 2010; Justin Lecher <jlec@gentoo.org> -tkimg-1.3.20081202.ebuild,
+  -tkimg-1.3.20081202-r1.ebuild:
+  Cleaned versions depending illegally on <libpng-1.4
 
   15 Jun 2010; Justin Lecher <jlec@gentoo.org> tkimg-1.4.20100510.ebuild:
   QA, imported prefix changes
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 37c7dd439fd8..31ab4aed85f3 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -5,17 +5,14 @@ AUX tkimg-1.3.20081202-prefix.patch 1786 RMD160 ad867dde7d6e431caaee180093eac6bc
 AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e8a827eb21db4 SHA1 87e9d8a3d60da0a42b92d9a1c35ab989452b4645 SHA256 29608daf79cca4a6b1292d1875ebd7d5f07ad60d4e09098ea5b8ece801da1983
 AUX tkimg-1.3.20081202-tests.patch 982 RMD160 ae52f7b9eb1504c1c116fe384abe3db806523239 SHA1 decd791a9ac761bfee56a0114a407960976a2a52 SHA256 28bc15f436d73cbd7ae91dc480aacc51dbcf5f3fa7125640742cfea9aed964b6
 AUX tkimg-1.4.20100510-gentoo.patch 9029 RMD160 5f5a8b699959cffe480df693aded7a41417d2fc6 SHA1 43a5fa102e6d6b9c2813d75a7149bfc434fa4bd2 SHA256 61a2354408092d2e86e549e3e2f93d73d2b3ee2b18d4950a7a1f430b9121e17e
-DIST tkimg-1.3.20081202.tar.bz2 4543694 RMD160 00f4dc4d8da53c7acaab68565f58ffc42f8151af SHA1 01acba5ad79f12e7d5ce511d35a9829424afa8ec SHA256 4e94f709fb471ec70398c1d4565fbec5869d0a521c7de5292484deeafc727625
 DIST tkimg-1.4.20100510.tar.bz2 4625881 RMD160 3d5a6e4186afd4487333e6b069a756810560147d SHA1 42befa7cf86c5c6271fe86bdbad2f0e0953acee1 SHA256 74b60431d6ae3767132d7f334af1a208b978d99e7b2710db84dc3da95b5ff0ae
-EBUILD tkimg-1.3.20081202-r1.ebuild 1575 RMD160 fd87cc2ef85149d39e9e65f86b738d0e70fad248 SHA1 145717bcfa8a86bae061cd9d803a5e449c023d92 SHA256 2605e8b054b13a3d1e10311a92f1ef41fdaf106222a768452bec79864cf79df9
-EBUILD tkimg-1.3.20081202.ebuild 1391 RMD160 0eeb1ff4cd2025ff607872413013310a8d0b097c SHA1 2afdf74b5cc62d795f99aec76052f862cbdceeeb SHA256 cb3c0e79815c896b9083e4bb95852cb053cfaf41e39956559f0e217e2bc781a5
 EBUILD tkimg-1.4.20100510.ebuild 1421 RMD160 ceda0aa3e32f4fb953636ade1032b816e3ab8aa4 SHA1 a6fc92019aa8f36deef5519403a5c75bfd3c42e3 SHA256 368d2a37af00e22f6da0d384f5807bd207538c95d1f3b6deef3738ce0a68bdcd
-MISC ChangeLog 3059 RMD160 0c9e44f92d10d770b1dd8fd7323236eead65e751 SHA1 7aee544973f0fdfb3ddcfaa4c4d72fe7ff87da82 SHA256 ed6184993238af4cfcf3a228d4518b3951b88dbdb2681f3dbad0e4d17c350d2d
+MISC ChangeLog 3222 RMD160 b79932a96fdd37750562d39d6199d5aacfe8249d SHA1 6286202c538d99640a2ad9590756945faea7959e SHA256 a23d33ef5d3af7e3f3fef42715cfcdc5c59c99c8346fb17bc61195edc90f2796
 MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXdP4ACgkQgAnW8HDreRZ/CwCgsi1dyrcIgpuw8pryjNIRmNWP
-p+QAnAk78XVjr3GQGTveurwDi5soq1jW
-=WuAr
+iEYEARECAAYFAkwo9bIACgkQgAnW8HDreRb0YwCgjQsWOrdMYyIAThZ2+IZQihzO
+1KkAoKi/PUF4w+ioqf7/Vwwod80khRoW
+=SMRV
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
deleted file mode 100644
index f8d6f9058953..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild,v 1.2 2010/05/14 14:21:02 jlec Exp $
-
-EAPI="3"
-inherit eutils prefix
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://sourceforge.net/projects/tkimg/"
-# src built with:
-# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.3.YYYYMMDD
-# tar cvfj tkimg-1.3.YYYYMMDD.tar.bz2  tkimg-1.3.YYYYMMDD
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-IUSE="doc"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	<media-libs/libpng-1.4
-	media-libs/jpeg
-	media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-systemlibs.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	sed -i \
-		-e 's:$(prefix)/man:$(prefix)/share/man:g' \
-		Makefile.in  || die
-	eprefixify \
-		libjpeg/tcl/jpegtclDecls.h \
-		libpng/tcl/pngtclDecls.h \
-		libtiff/tcl/tifftclDecls.h \
-		libz/tcl/zlibtclDecls.h
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
deleted file mode 100644
index e0478342aa99..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild,v 1.9 2010/05/14 14:21:02 jlec Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://sourceforge.net/projects/tkimg/"
-# src built with:
-# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.3.YYYYMMDD
-# tar cvfj tkimg-1.3.YYYYMMDD.tar.bz2  tkimg-1.3.YYYYMMDD
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-IUSE="doc"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	<media-libs/libpng-1.4
-	media-libs/jpeg
-	media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-systemlibs.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	sed -i \
-		-e 's:$(prefix)/man:$(prefix)/share/man:g' \
-		Makefile.in  || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-	# Make library links
-	for l in "${D}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}