amd64/x86 stable wrt #395743

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

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index 6a02958abce8e1347a5711583e6b0634150ae111..6d26dd8ff1d15452e32e805ef9edee502a73bcd7 100644 (file)
--- a/net-print/xpp/ChangeLog
+++ b/net-print/xpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/xpp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.25 2011/12/10 14:12:17 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.26 2012/01/05 17:25:33 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xpp-1.5-r1.ebuild:
+  amd64/x86 stable wrt #395743
 
   10 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -files/cups.diff,
   -files/inputslider.h.patch:

diff --git a/net-print/xpp/Manifest b/net-print/xpp/Manifest
index fa0f5510c506003d6c4a6a4d1c2ed0ea6030714f..25d78d2632ebcefce19b45697414c1bdc7e90c2e 100644 (file)
--- a/net-print/xpp/Manifest
+++ b/net-print/xpp/Manifest
@@ -5,18 +5,18 @@ AUX xpp-fltk-1.3.0.patch 1012 RMD160 90812a8730e9e2a8615bbdc6e06c5e4eb8c09b4a SH
 AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267
 AUX xpp-glibc-2.10.patch 368 RMD160 3327f4c12d525f5857cc67327d34f73c38e3f641 SHA1 e186e630873fb15a032572d61e20294e6175bd10 SHA256 072349dca84c0c956235e4f8c5d78d579da94be1dbdf2ea4a37bb2b9335b96ae
 DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d
-EBUILD xpp-1.5-r1.ebuild 987 RMD160 5fdb1089dcfc4e8c3a00f087ab98ec8245acce38 SHA1 c7a21008e0e3dd8114fd03503b883b318a136023 SHA256 2c8160c24dbddb636903e8b4f3dd492b3ce841600fbe5666d712ccda67d9e8da
+EBUILD xpp-1.5-r1.ebuild 989 RMD160 354f4890e2c6b3b83c54b6ec7aa84374a522688f SHA1 cf3a864cb624919eb6959902ac6ced80e8a48274 SHA256 fa9f649ed4ce561d1371869b0b2c5452c6ae56718eb2fe3d0ef85ea1b51d8734
 EBUILD xpp-1.5.ebuild 960 RMD160 1da6286ac14c16bbe510b9b36b8f0362ef0fb43e SHA1 ae4823863c1459142690d2a9fa8c3e7c631b81b8 SHA256 f416d73187680baca99184a97bc98a394c1539416cd038d6d099a0933950bc5c
-MISC ChangeLog 3573 RMD160 4d54239b4e60a2b2335da7e1456402a442e6faf2 SHA1 a8d73b17724831927eca635963cb5d9a4451f4f0 SHA256 079bc4319977501b929f4b7ea55234cd9e9a6a6811a5c80155393209b9f3afd9
+MISC ChangeLog 3678 RMD160 6879dca0800f98475ab5efa69a8bc4267889371d SHA1 e4c6f694f28f7118f328a3e5cb3c21c81c04491b SHA256 f4bc266defb7aad4bdcdf1fb5a52719b062f97555bac3abd2de814b0d502be85
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO42ieAAoJEEdUh39IaPFNqA4H/1K/CVbR113POggaCOntoZj9
-VeehP9mSTfXw745XGULsOeZ9DnwVkoIYzS2USgLROgt5ZJTLKDfQE/BcHmbd19EI
-hcVooTk16I2EwcLo5NHlYY7DLOimdvbjvD3axcBeaZtEkI6FQ5wbkFO4/xJrrNP7
-OnotbSl9RAN0kCbatkzbmPTalIn5nWeCIURtiLOzDyAVAEWHNVMIIgba1qS4O5LI
-36BJJXI0mrzW4BV+On73mevN85p8knKuuwsKDhq/HWREpt5rudPTasOgngPfW9lt
-pgaPNH0le+pDyGotXWDmPsTlgp7CrNg6JnOVgjdmcap1bxjeKvCcy1/568jYe8w=
-=Lskb
+iQEcBAEBAgAGBQJPBdyRAAoJEEdUh39IaPFNS3UH/iBRbP58w8SnI6h5OnpGosRf
+DdabzaM0d785rxTY8tyoGSNHtC8VTVG6p2YURhHbQM1Ptr4A2D0ZTn3Ri1JeFE5G
+K3JhlZSpi53elQxqs/0365P6B1Dzlr96r8SDDHvdhUIvuySCNXrvHc0WPxMF4wnE
+l8/tDm/tGYwLzemvkM4weOGLZn7I+TFZMUxEaL4PzMJ6fnkqaR+VuK1n/Nhhm58u
+/jfFf/mD0u2Fig3pWzBGwdMu4k07W5D2/uPqZX8n5a9HbNptS08W2cb4W2cQHIfZ
+uMMX2HXlLjUBZTEcJ/tt0GZeZORdmKH8MWmeyBg1Cm3uDVCxrHINs+9bvxwvHEw=
+=ZaRO
 -----END PGP SIGNATURE-----

diff --git a/net-print/xpp/xpp-1.5-r1.ebuild b/net-print/xpp/xpp-1.5-r1.ebuild
index abc4d3a29f158126e40ecafd854cf76f9146aa3a..1a8c449e756e307e5867bde0b6614dff1bc9281f 100644 (file)
--- a/net-print/xpp/xpp-1.5-r1.ebuild
+++ b/net-print/xpp/xpp-1.5-r1.ebuild
@@ -1,24 +1,24 @@
-# 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/net-print/xpp/xpp-1.5-r1.ebuild,v 1.1 2011/12/10 14:10:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5-r1.ebuild,v 1.2 2012/01/05 17:25:33 ssuominen Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="X Printing Panel"
-SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
 HOMEPAGE="http://cups.sourceforge.net/xpp/"
+SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="net-print/cups
-       >=x11-libs/fltk-1.3.0:1
-       virtual/jpeg
-       media-libs/libpng:0
+RDEPEND=">=media-libs/libpng-1.2:0
+       net-print/cups
        sys-libs/zlib
+       virtual/jpeg
+       >=x11-libs/fltk-1.3:1
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXft"