From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 20 Oct 2011 15:46:20 +0000 (+0000)
Subject: Move blockers from RDEPEND to DEPEND as per recommendation by "few" from Freenode
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8010e83535cc03471b725103be3d67ddc88b4638;p=gentoo.git

Move blockers from RDEPEND to DEPEND as per recommendation by "few" from Freenode

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64
---

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 8f52aaabc5ac..5e4bdd27c4df 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.321 2011/10/18 14:18:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.322 2011/10/20 15:46:20 ssuominen Exp $
+
+  20 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.5.ebuild:
+  Move blockers from RDEPEND to DEPEND as per recommendation by "few" from
+  Freenode
 
   18 Oct 2011; Jeroen Roovers <jer@gentoo.org> libpng-1.5.5.ebuild:
   Stable for HPPA (bug #384701).
@@ -9,10 +13,8 @@
   ppc/ppc64 stable wrt #384701
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.5.ebuild:
-  Block <libview-0.6.6-r2 for polluting pkg-config Libs: with versioned -lpng
-
-  16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.5.ebuild:
-  Block <libsexy-0.1.11-r3 for polluting pkg-config Libs: with versioned -lpng
+  Block <libsexy-0.1.11-r3 and <libview-0.6.6-r2 for polluting pkg-config
+  Libs: with versioned -lpng
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> libpng-1.5.5.ebuild:
   amd64 stable wrt #384701
diff --git a/media-libs/libpng/libpng-1.5.5.ebuild b/media-libs/libpng/libpng-1.5.5.ebuild
index 0696fe1e25d7..cb88b1ac4444 100644
--- a/media-libs/libpng/libpng-1.5.5.ebuild
+++ b/media-libs/libpng/libpng-1.5.5.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/media-libs/libpng/libpng-1.5.5.ebuild,v 1.10 2011/10/18 14:18:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.5.ebuild,v 1.11 2011/10/20 15:46:20 ssuominen Exp $
 
 # WARNING: media-gfx/optipng is shipping internal copy of libpng14. Look out for
 # security.
@@ -19,11 +19,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng static-libs"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
 	!!<x11-libs/gdk-pixbuf-2.24.0-r1
 	!!<x11-libs/libsexy-0.1.11-r3
-	!!<x11-libs/libview-0.6.6-r2"
-DEPEND="${RDEPEND}
+	!!<x11-libs/libview-0.6.6-r2
 	app-arch/xz-utils"
 
 DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )