Everything from gentoo-x86 is using FLTK 1.3.0 from SLOT="1". Remove keywording from unused (and deprecated) SLOT="2".

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

3 files changed, 22 insertions, 15 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index a57c7c90da83..0004515787eb 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.203 2012/02/04 20:34:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.204 2012/02/04 20:44:35 ssuominen Exp $
+
+  04 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  fltk-2.0_pre6970-r1.ebuild:
+  Everything from gentoo-x86 is using FLTK 1.3.0 from SLOT="1". Remove
+  keywording from unused (and deprecated) SLOT="2".
 
   04 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/fltk-1.1.9-as-needed.patch, -files/fltk-1.1.9-conf-tests.patch,
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index dcb2d07510e2..39ee594d256e 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -15,17 +15,17 @@ AUX fltk2-nogl.patch 1222 RMD160 18ae618fb0b70678bd811b0c1871bac11230515a SHA1 0
 DIST fltk-1.3.0-source.tar.gz 4111004 RMD160 dea1eb42ae1b81efa22a54198956211367e2945a SHA1 720f2804be6132ebae9909d4e74dedcc00b39d25 SHA256 990676808294cea4cca3de833ad5a5de08073c11b665356d4ecf35d22535b21c
 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3
 EBUILD fltk-1.3.0.ebuild 3853 RMD160 abc99b1e152283a70e95a24158febce69f7044a7 SHA1 082d23c6182ae5e94ac9d63263de29836169caa2 SHA256 fd416fcc07eed803cd2b87515d92f37d84090fc16417489ae34f3d6d5ec7a132
-EBUILD fltk-2.0_pre6970-r1.ebuild 2635 RMD160 6aa61a9e0af5546123ad515e5b6d2f9d650c4b59 SHA1 257bc6d9cf8ebf68621b411a72b37705a13b082a SHA256 2f1de8727ab54f968c857741e27d983718b786d8e2cd976d226ba59ddedc2eb1
-MISC ChangeLog 28669 RMD160 b2780e1ed6c0fe3eaadaa7910b0662328140d7fb SHA1 b223645c6e28a2b45c917366ce27ff0edf5e9a9c SHA256 b83cce756fac872443e712cc39a1d32e5b11edb104aec649d3b35c21cf53c90b
+EBUILD fltk-2.0_pre6970-r1.ebuild 2761 RMD160 62b0ca541ac6ee56dd91cd722fa779a9ef8a8342 SHA1 aca2c680cba9bcc34617172330d3ab9f9cb42203 SHA256 295eb21b7afbf07285144fc1b5bc09422b6268a2fdd7f4eacdc79a5cc01febd8
+MISC ChangeLog 28877 RMD160 4f89760dff00cc949636717805e44d6b876c56fa SHA1 413e8538dfb088bf1d724353c7527846b498d69c SHA256 5c1b874673056ba2472ffa375d39a4cd0194cea6881971798ddc6422b34272ab
 MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPLZWyAAoJEEdUh39IaPFN1coH/AnqjZKInopjHoEnsEc/eMtT
-ucUHoakoXAdvMwjaHrBsq4DQa7vJvk/FYmz5OLbyzC3SZjWqd/EJEnwlGZ+oFe34
-LF5fbWplhyfkTLevJl111NMTs+GBTuyMygp6png+kQzU3Cn2DatJAi0LtKnOXIXt
-uCvvBTMZUIBnhZ4/l+SlV3pRNx7l2Mk/+YfNMVp3ngnWaFYscd0ZGecsJOC/S35D
-YOI1uQJMusi0tPItyX2+yQ29+WqWItVCht/PjlU2LgDm86qrRfZr/T3V37nKR6d7
-ii0lvD3Y69UFvOmrso85ZxQQ7FN3UOZEjZHdRz71oGhkO8wM7q4yKMEiCnUwyZ4=
-=SrGu
+iQEcBAEBAgAGBQJPLZgJAAoJEEdUh39IaPFN79oH/iYPJ/dOmzP02C/bnMZAzwPK
+xBtgPhw74xf0BEWJpUbIUU1+XOo5NQcsSt+vw9EvXmZQdFw+hNfO7wGKzWQ0iW5r
+0aySBlG3Kl60Fx9GrWUH58V+8Kf1DHkWTNh5N02zHCNtCZmcjIT+CiLce0e7pWOv
+ZwFzpsmf0Rqcu9CriWmheJDOpK5025x9bkHFP2AxmcDvEcycypYNWm1NwHs5t6ng
+Wp7Qd959nEopEwikH10ID2dbZncm9ltXcMD2CaYgCoN6eFnpIn74GOH8+KJAFf9A
+pERqz+Y2MXYD7qj9DHP2ViDxMoRTQCZZiChO10GoOJJBjFB8kIC5E+u8SVdQMZU=
+=tTEW
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
index a6a2d84f4788..37ee21cddce9 100644
--- a/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
+++ b/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild,v 1.9 2011/10/23 16:26:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-2.0_pre6970-r1.ebuild,v 1.10 2012/02/04 20:44:35 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 inherit multilib autotools flag-o-matic
 
 MY_P=${P/_pre/.x-r}
@@ -10,7 +10,9 @@ DESCRIPTION="C++ user interface toolkit for X and OpenGL"
 HOMEPAGE="http://www.fltk.org/"
 SRC_URI="mirror://easysw/fltk/snapshots/${MY_P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+# NOTE: KEYWORDS removed in purpose since everything from gentoo-x86 is using
+#       FLTK 1.3.0 series from SLOT="1" now
+#KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 LICENSE="FLTK LGPL-2"
 SLOT="2"
 IUSE="cairo debug doc +jpeg +png opengl +xft xinerama zlib"
@@ -20,7 +22,7 @@ RDEPEND="x11-libs/libXext
 	x11-libs/libSM
 	x11-libs/libXt
 	xft? ( x11-libs/libXft )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	jpeg? ( virtual/jpeg )
 	opengl? ( virtual/opengl )
 	cairo? ( x11-libs/cairo )