From 249fcce970c6c589ef50a2ef8cad21b7146f8f70 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 14 May 2010 14:21:02 +0000
Subject: Correct Version Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

---
 dev-tcltk/tkimg/ChangeLog                    | 13 ++++++-
 dev-tcltk/tkimg/Manifest                     | 16 ++++-----
 dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild |  4 +--
 dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild    |  4 +--
 dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild    | 54 ----------------------------
 dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild    | 54 ++++++++++++++++++++++++++++
 6 files changed, 78 insertions(+), 67 deletions(-)
 delete mode 100644 dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild
 create mode 100644 dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild

(limited to 'dev-tcltk')

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index dde924bbcf3e..3faf7c3d34ce 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,17 @@
 # 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.13 2010/05/11 16:42:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.14 2010/05/14 14:21:02 jlec Exp $
+
+*tkimg-1.4.20100510 (14 May 2010)
+
+  14 May 2010; Justin Lecher <jlec@gentoo.org> tkimg-1.3.20081202.ebuild,
+  tkimg-1.3.20081202-r1.ebuild, -tkimg-1.3.20100510.ebuild,
+  +tkimg-1.4.20100510.ebuild:
+  Correct Version
+
+  14 May 2010; Justin Lecher <jlec@gentoo.org> tkimg-1.3.20081202.ebuild,
+  tkimg-1.3.20081202-r1.ebuild, tkimg-1.3.20100510.ebuild:
+  Fixed libpng version in deps, #319495
 
 *tkimg-1.3.20100510 (11 May 2010)
 
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 0b92b2f9b033..3bb399f242da 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -6,16 +6,16 @@ AUX tkimg-1.3.20081202-systemlibs.patch 9637 RMD160 fc6a94501654307bae837731f18e
 AUX tkimg-1.3.20081202-tests.patch 982 RMD160 ae52f7b9eb1504c1c116fe384abe3db806523239 SHA1 decd791a9ac761bfee56a0114a407960976a2a52 SHA256 28bc15f436d73cbd7ae91dc480aacc51dbcf5f3fa7125640742cfea9aed964b6
 AUX tkimg-1.3.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.3.20100510.tar.bz2 12449234 RMD160 d590495c26125baace8dbfecef49b286e38ca45d SHA1 4da4933ce3924a3513dd662d7b0240eb04617810 SHA256 cf3282bc8bc4250fada03bdd159ef20bd8c81a38b178937d8f4e844cb6089c8e
-EBUILD tkimg-1.3.20081202-r1.ebuild 1570 RMD160 87c956d43a5267d668465a4a1328188c5b2574d9 SHA1 b881032964098289e2ea4f4ca82b0c8c02ce0bfc SHA256 9398a9839f78c969f4eaffff947e87ae6f07e5157159b4a4a0059c2a8391c09c
-EBUILD tkimg-1.3.20081202.ebuild 1386 RMD160 bac7f154f05d43cde3144a67c3ac13412c454e60 SHA1 222e398598524eb2a42d864670a104021c32c1c1 SHA256 a5a07240aeb6d0aee29e8512f7be8a5e9f1b17fe0c650e4892b77f56325f3b66
-EBUILD tkimg-1.3.20100510.ebuild 1389 RMD160 39c9724a83cfdbbfba58b78d651060e2045cfebd SHA1 09a4cf48b6175d27ce1c4266cab80f70347b0bb5 SHA256 7e71b29abf81e200196d7eeaaf29d1c7c58e5d45a057f600678ab67bac918344
-MISC ChangeLog 2403 RMD160 46a81a5fcbdf24d01539e344f2a38c72c83c5571 SHA1 1fedb521567047f90f44ac93022bdb9cbccf996d SHA256 124ac8a536265ef26772e5f13731f549f8daa9993a5eff93a0eb17c58f46a520
+DIST tkimg-1.4.20100510.tar.bz2 12449234 RMD160 d590495c26125baace8dbfecef49b286e38ca45d SHA1 4da4933ce3924a3513dd662d7b0240eb04617810 SHA256 cf3282bc8bc4250fada03bdd159ef20bd8c81a38b178937d8f4e844cb6089c8e
+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 1395 RMD160 a159a915fc0242f8ecc586061e10dc3295d8c2a5 SHA1 80708c76cff967418e686f9b75d29a1f20efa189 SHA256 b63c7e621967cc38a06714d9c5a930a3838a2b6265957ec032b7e82032e8e18b
+MISC ChangeLog 2795 RMD160 aebcc9916473b49bc8f7ccdf2573cc6608e0d04f SHA1 ca56c7d3b7cea10f986afc0c2cc9bf791c382684 SHA256 e529f85988d46d6ea3a78d8f03820811dc279c28693d8dd72ad3779f41b2fdd2
 MISC metadata.xml 413 RMD160 1ac848d3c3c9bdc181eb74296bed320a04939230 SHA1 b87cf6e1539c38b9d47206b3de300d4d1b015e19 SHA256 e4be7858b69d8be49bd900961e05825edcacfb4c81b6f20ebc6afd65fb3b2fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvpiQwACgkQgAnW8HDreRYN1QCffL3izCblD7L9dIZAniuNcli3
-FSYAoK85o1GdA75dGpEe3s8bta2xa5jX
-=mh/a
+iEYEARECAAYFAkvtXFUACgkQgAnW8HDreRbcVACfUogK2rijdxjtyyLyytqsxQsT
+Y/oAn33j4V4nHBVkU/iTlWkum2NXu2ui
+=43rA
 -----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
index 7daa02ca2342..f8d6f9058953 100644
--- a/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2010/04/01 19:58:54 jlec Exp $
+# $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
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	media-libs/libpng
+	<media-libs/libpng-1.4
 	media-libs/jpeg
 	media-libs/tiff"
 RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
index da7bbfefc5cf..e0478342aa99 100644
--- a/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.3.20081202.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2010/04/01 19:58:54 jlec Exp $
+# $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
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	media-libs/libpng
+	<media-libs/libpng-1.4
 	media-libs/jpeg
 	media-libs/tiff"
 RDEPEND="${DEPEND}"
diff --git a/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild
deleted file mode 100644
index a3ac880d655e..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.3.20100510.ebuild
+++ /dev/null
@@ -1,54 +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.20100510.ebuild,v 1.1 2010/05/11 16:42:47 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
-	media-libs/jpeg
-	media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eprefixify \
-		libjpeg/jpegtclDecls.h \
-		libpng/pngtclDecls.h \
-		libtiff/tifftclDecls.h \
-		zlib/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.4.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
new file mode 100644
index 000000000000..6bb279117f39
--- /dev/null
+++ b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
@@ -0,0 +1,54 @@
+# 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.4.20100510.ebuild,v 1.1 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}-gentoo.patch
+	eprefixify \
+		libjpeg/jpegtclDecls.h \
+		libpng/pngtclDecls.h \
+		libtiff/tifftclDecls.h \
+		zlib/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
+}
-- 
cgit v1.2.3-65-gdbad