Error out in pkg_setup() instead of causing dependency conflict with libpng.

(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)

6 files changed, 56 insertions, 11 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index d846068387d6..36664e73f703 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.27 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.28 2011/09/17 17:32:28 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> tkimg-1.4.ebuild,
+  tkimg-1.4-r1.ebuild, tkimg-1.4.20100510.ebuild, tkimg-1.5_pre324.ebuild,
+  tkimg-1.5_pre324-r1.ebuild:
+  Error out in pkg_setup() instead of causing dependency conflict with libpng.
 
   14 Aug 2011; Justin Lecher <jlec@gentoo.org> tkimg-1.4.ebuild,
   tkimg-1.4-r1.ebuild, tkimg-1.4.20100510.ebuild, tkimg-1.5_pre324.ebuild,
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
index 6aabc2799d11..c5e856a8c635 100644
--- a/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild,v 1.2 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild,v 1.3 2011/09/17 17:32:28 ssuominen Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	=media-libs/libpng-1.4*
+	>=media-libs/libpng-1.4
 	virtual/jpeg
 	media-libs/tiff"
 DEPEND="${RDEPEND}
@@ -33,6 +33,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
+pkg_setup() {
+	if has_version ">=media-libs/libpng-1.5"; then
+		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-nojbig.patch
 }
diff --git a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
index 0f1ab4aea9be..277f53e741bc 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild,v 1.7 2011/09/17 17:32:28 ssuominen Exp $
 
 EAPI="3"
 
@@ -21,11 +21,19 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 DEPEND="
 	dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	=media-libs/libpng-1.4*
+	>=media-libs/libpng-1.4
 	virtual/jpeg
 	media-libs/tiff"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	if has_version ">=media-libs/libpng-1.5"; then
+		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+}
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.patch \
diff --git a/dev-tcltk/tkimg/tkimg-1.4.ebuild b/dev-tcltk/tkimg/tkimg-1.4.ebuild
index 8443339179a2..ca40a862f2a2 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.ebuild,v 1.5 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.ebuild,v 1.6 2011/09/17 17:32:28 ssuominen Exp $
 
 EAPI="3"
 VIRTUALX_USE=test
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	=media-libs/libpng-1.4*
+	>=media-libs/libpng-1.4
 	virtual/jpeg
 	media-libs/tiff"
 DEPEND="${RDEPEND}
@@ -29,6 +29,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MYP}"
 
+pkg_setup() {
+	if has_version ">=media-libs/libpng-1.5"; then
+		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+}
+
 src_test() {
 	Xmake test || die "Xmake failed"
 }
diff --git a/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild
index 3967e59d328e..3e11730a6034 100644
--- a/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild,v 1.2 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.5_pre324-r1.ebuild,v 1.3 2011/09/17 17:32:28 ssuominen Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	=media-libs/libpng-1.4*
+	>=media-libs/libpng-1.4
 	virtual/jpeg
 	media-libs/tiff"
 DEPEND="${RDEPEND}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 
+pkg_setup() {
+	if has_version ">=media-libs/libpng-1.5"; then
+		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+}
+
 src_prepare() {
 	local i
 
diff --git a/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild b/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild
index 76452f04e111..f2b6d48d8e59 100644
--- a/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild,v 1.3 2011/08/14 14:41:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.5_pre324.ebuild,v 1.4 2011/09/17 17:32:28 ssuominen Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-lang/tk
 	>=dev-tcltk/tcllib-1.11
-	=media-libs/libpng-1.4*
+	>=media-libs/libpng-1.4
 	virtual/jpeg
 	media-libs/tiff"
 DEPEND="${RDEPEND}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
 
+pkg_setup() {
+	if has_version ">=media-libs/libpng-1.5"; then
+		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+}
+
 src_test() {
 	Xmake test || die "Xmake failed"
 }