Unmask libpng 1.5.5 for x86

13 years ago · 757a38fcce
parent c4e77ece3a
commit 757a38fcce
8 changed files with 31 additions and 13 deletions
--- a/app-misc/cldg-meta/ChangeLog
+++ b/app-misc/cldg-meta/ChangeLog
@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+*cldg-meta-11.9-r1 (03 Nov 2011)
+
+  03 Nov 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+  -cldg-meta-11.9.ebuild, +cldg-meta-11.9-r1.ebuild:
+  add media-libs/libpng:1.4
+
 *cldg-meta-11.9 (20 Sep 2011)

  20 Sep 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
--- a/app-misc/cldg-meta/Manifest
+++ b/app-misc/cldg-meta/Manifest
@ -1,3 +1,3 @@
-EBUILD cldg-meta-11.9.ebuild 1401 RMD160 efbbd44f47d6ac55aa8daf65bbabf5addfbbaf56 SHA1 09aaf1a927fa4bdfe6f80491b0fe4433dcba0f1a SHA256 076329b03bec7580f8d74cb8c46d3aaa73c101a79fa08f1b89c82f959ac2a3a3
-MISC ChangeLog 3450 RMD160 ff2329bbe2106f732eca5e37ca43a669fbde8d4b SHA1 a9182d104306315793a844e560725bbeed6a7f9a SHA256 b7aaea53a30561a3cf60212a7645fd02e348e4e26f8b10f43a874f014b5771f8
+EBUILD cldg-meta-11.9-r1.ebuild 1384 RMD160 579422a1cfc3622deb85eab42bb33fcc14f50dfc SHA1 3346f0579b9bfff11af7e4cd00c5f876f35a2425 SHA256 584701bb6bcb11c05985d7d4988a5e76c3fb42e2eb507994d063d3c451326ed8
+MISC ChangeLog 3631 RMD160 0bb32a172a21fc9bfa418ce8bd5309778ee28461 SHA1 a8399b92af446c02802d96bef727da0e63454b5d SHA256 32e38b622108048b59130151b23ab67119f4611d3c9e8645708c623d7d83e7b8
 MISC metadata.xml 263 RMD160 596dddaf55974cdaa7642643631b4e506681adde SHA1 56cba5a8dbf3977d7891ec138b75e8fe3eb6fadd SHA256 0a6e854923033ffffca2b1ce19e0b12ae33a4d6a372b2613e3ded5b750899526
--- a/app-misc/cldg-meta/cldg-meta-11.9-r1.ebuild
+++ b/app-misc/cldg-meta/cldg-meta-11.9-r1.ebuild
@ -26,13 +26,6 @@ calculate_noxorg
 calculate_nowireless
 "

-RDEPEND="${RDEPEND}
-	!app-misc/cls-meta
-	!app-misc/cl-dict-meta
-	!app-misc/cl-desktop-meta
-	!app-misc/cl-useful-meta
-"
-
 RDEPEND="
 	app-misc/cl-base-meta
 	app-misc/cl-tools-meta
@ -54,3 +47,9 @@ RDEPEND="
 	!calculate_noxorg? ( app-misc/cl-xorg-meta )
 	!calculate_nowireless? ( app-misc/cl-wireless-meta )
 "
+
+#for compile gnome-base/gnome-settings-daemon-2.32.1-r2
+RDEPEND="${RDEPEND}
+	media-libs/libpng:1.4
+"
+
--- a/app-misc/cldx-meta/ChangeLog
+++ b/app-misc/cldx-meta/ChangeLog
@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+*cldx-meta-11.9-r1 (03 Nov 2011)
+
+  03 Nov 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+  -cldx-meta-11.9.ebuild, +cldx-meta-11.9-r1.ebuild:
+  add libpng:1.4
+
 *cldx-meta-11.9 (20 Sep 2011)

  20 Sep 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
--- a/app-misc/cldx-meta/Manifest
+++ b/app-misc/cldx-meta/Manifest
@ -1,3 +1,3 @@
-EBUILD cldx-meta-11.9.ebuild 1367 RMD160 9058491665a6766c5f8f158988aef1df2d061827 SHA1 71bb3752bfe7bf07f7975c1bbba099cf16d26d91 SHA256 a47527db191b56c2696b5a4d6b03f5ba36d6cf0b91497cbf20ace1f9be345be6
-MISC ChangeLog 4354 RMD160 8781252d8c81ad31ae56a1cc58504c4951b5c05a SHA1 04ad40e7ed01591fd3504fc6917487b4e10752da SHA256 71301f2317cb9515c2b7fcc1e6ef22f92ed94f4534d390a97d4222581e37c8fd
+EBUILD cldx-meta-11.9-r1.ebuild 1443 RMD160 50c261f32c4276923ec5743731be15364918b01a SHA1 979283f50abdb20a7cb4ecb2a826b560de5b4b52 SHA256 27138465d95dd36ba12ab6663664ad4f4dfd54ec3c9e737a0e31ec6c1384ed93
+MISC ChangeLog 4524 RMD160 581386d077ade1b9000b76abb6486d57f9e437de SHA1 ab1d3d92a0312d3208b6909d8faf10e07ab2fa67 SHA256 3f9699d24e8a01c564fab28110d08738f1b8d3d98bad5275050dd4647c59f006
 MISC metadata.xml 262 RMD160 2230fae163c003c26da4221c8b25a0c7b9ed0602 SHA1 9187b064dbcca538b3d3349ac9340fd5869e7e96 SHA256 adfc7d0bbf6ccbdbe03704cb131512d2ccfd9c6f71ac5ebc7746c3539116af7e
--- a/app-misc/cldx-meta/cldx-meta-11.9-r1.ebuild
+++ b/app-misc/cldx-meta/cldx-meta-11.9-r1.ebuild
@ -53,3 +53,9 @@ RDEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
 	gnome-base/gdm
 "
+
+# for compile gdm-2.20.11-r1
+RDEPEND="${RDEPEND}
+	media-libs/libpng:1.4
+"
+
--- a/profiles/calculate/make.conf/x86/package.mask
+++ b/profiles/calculate/make.conf/x86/package.mask
@ -1,2 +1 @@
-=media-libs/libpng-1.5.5
 =media-libs/gd-2.0.35-r3
--- a/profiles/calculate/package.keywords/defaults
+++ b/profiles/calculate/package.keywords/defaults
@ -1,6 +1,8 @@
 <=sys-apps/portage-2.2.0 amd64 x86
 ~media-gfx/splashutils-1.5.4.4 amd64 x86

+~media-libs/libpng-1.4.8 amd64 x86
+
 ~sys-apps/iproute2-2.6.38 amd64 x86
 ~sys-kernel/linux-headers-2.6.39 amd64 x86

@ -18,7 +20,7 @@

 ~app-emulation/emul-linux-x86-bjdeps-0.1 amd64 x86

-~net-print/cnijfilter-3.20 amd64 x86
+~net-print/cnijfilter-3.50 amd64 x86

 ~net-print/hplip-3.11.10 amd64 x86
 ~net-print/hplip-plugin-3.11.10 amd64 x86