old

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

4 files changed, 19 insertions, 72 deletions

diff --git a/media-gfx/flphoto/ChangeLog b/media-gfx/flphoto/ChangeLog
index 4111953d3d28..0de3e8ab95f4 100644
--- a/media-gfx/flphoto/ChangeLog
+++ b/media-gfx/flphoto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/flphoto
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.26 2011/09/14 13:34:50 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/ChangeLog,v 1.27 2012/01/05 18:20:25 ssuominen Exp $
+
+  05 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -flphoto-1.3.1-r1.ebuild:
+  old
 
   14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> flphoto-1.3.1-r2.ebuild,
   +files/flphoto-1.3.1-libpng15.patch:
diff --git a/media-gfx/flphoto/Manifest b/media-gfx/flphoto/Manifest
index 6afb8721158e..a835e7b66aed 100644
--- a/media-gfx/flphoto/Manifest
+++ b/media-gfx/flphoto/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX album.xml 288 RMD160 052add01b8967c9a564da488ec082f23974545f0 SHA1 62ea904cb231bba911fa7807a234a754b431b0b7 SHA256 6718e126eeeecf0b2f0225dc6c86f280d956384859605a65dbc9d53c5b30c236
 AUX espmsg.patch 966 RMD160 745348f6366fc6159255c4b69c42368ecb952172 SHA1 57564b8571edc56a8e357436483370880d637ef8 SHA256 12aadda040f205edfae4bdf3c536de03898b88bf2aa30d492d3b4c03e251625b
@@ -7,16 +7,17 @@ AUX flphoto-1.3.1-glibc28.patch 394 RMD160 bfe4f8d82c2990b4ecc4be6138fd0b4206960
 AUX flphoto-1.3.1-libpng15.patch 198 RMD160 ce7c96c2bf71ebf1fcd6b13b7dcc4f5bec8b4663 SHA1 8843ffd3b196a5eb7123ac90930209cdf5f90f91 SHA256 daae0e1981ba245281772272bde8d33664749582a04fb0e48c07dcf9342728c0
 AUX flphoto-1.3.1-linking.patch 4918 RMD160 698793987fa8ceb2e8854cbde6128d4a9280c1a1 SHA1 bf6b9bf23dbe9559a0d0fafa74b32bbb2d98e59e SHA256 d737c5a31ad3b886bfb2cb9dd16032885c4a2021dcf9d8b9dc17998f921225bb
 DIST flphoto-1.3.1-source.tar.gz 797714 RMD160 d8c99e6dbaa448f3590de3f961ba28a1cc3d706e SHA1 3486233c94a74d7f2ec9d325590c1d0191c91952 SHA256 c9e41fd45c584923bd749e6ff52ef39ceb3800f3122d8fd48904a980f6e2b9b3
-EBUILD flphoto-1.3.1-r1.ebuild 1267 RMD160 edb00dafd218652202b05e7081d8c00dd650c686 SHA1 3fe223c1666f78ebf0800373319c6e025f0430db SHA256 65b8bca68cc4f882ff9fb01474faef4b2cb05f0d3bbb5b01337f79af146d936f
-EBUILD flphoto-1.3.1-r2.ebuild 1426 RMD160 3441984e1095af3db2eab6b5d8440fe18722b4a9 SHA1 a8382c4cbae7eaa5e50c6cca0880c24b4dbc5e48 SHA256 b0978e7a20f58ab30abbcf62b933c2f804a3a4bdc32966091591c58812f45fe8
-MISC ChangeLog 3604 RMD160 aeaac377b45c8e4c1dba035ec11161cc76db8e29 SHA1 6eb8f6558be853c33baf64229ce8b17aab9db890 SHA256 2e48992883fbdfe8be50e7af397ae55980b546603c28fc5adc086fb10d416804
+EBUILD flphoto-1.3.1-r2.ebuild 1436 RMD160 66f5751eb41ccce4ca7457613bd461591694a12c SHA1 72a66a93d052b30904dd75e48fec65a85f9faa9a SHA256 1ea92348692cb7b6efac3eb792b1ee72fb0eea6449b09545374cba55e1b8879c
+MISC ChangeLog 3691 RMD160 3152d09ca1853441cc63b7b8ac09fd1548cd4352 SHA1 c0bb33d58248c65189cde0be90a7b31c8742cf2f SHA256 47ebae90c59c88808be2742c896353ac2059892df19f7ab039fab677f9589589
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59owQACgkQfXuS5UK5QB26FQQAruuZTvDjh4X7dVnCMu47TTYc
-wfa5+6/xy5GcUQzR9Df7kdWdZU88yzIJixGnfGt3jEbMiQPl7Dkq2Xn35ZgJ1D2o
-3l02DPmoDD0+4ZXlnaj9GDAIyvBdrkgkidhLj7912c5e0y69PRLCuxUvJ1HxTfEO
-RTvTnaYJ6IfMO/Yx3QI=
-=AG2T
+iQEcBAEBAgAGBQJPBeluAAoJEEdUh39IaPFNZiIH/1iDnsjxNF+or5Eqjy4Xvaw0
+Gz76IXKX/PzJisRp1CxUkbgpE+9A1FWMlpJ+e0FEZMlvKrEft06MXqoHhWedVa1q
+ceknwV8E9jzhIYKCD3AyAoYBOTeQS/PjH6++ReGacBLf4eSv1BfeaRAAX5UYzC2r
+sqx1pzDQGybFSshMV5bLBmtEYenGjJDrndXUNMwFAJMvMF/nhmtja18kcbVlwPkb
+QlljJDdNoqpnNKwHIHnrlFkd9v9XqiBP9Lgb8bfDRU4MnfC8ixRyOOxJhz4Wt0zV
+eWpTK++ceD3IjnEMgrtfj/2GsD6UAvestIh58+ThtboYHyE3eezlNrOA8vpAT+w=
+=annU
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild
deleted file mode 100644
index 2712a0802dc4..000000000000
--- a/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r1.ebuild,v 1.7 2011/03/20 20:14:56 jlec Exp $
-
-EAPI=1
-
-inherit eutils fdo-mime
-
-DESCRIPTION="Basic image management and display program based on the FLTK toolkit"
-HOMEPAGE="http://www.easysw.com/~mike/flphoto/"
-SRC_URI="mirror://sourceforge/fltk/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="cups gphoto2"
-
-DEPEND="
-	dev-libs/openssl
-	virtual/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/fltk:1
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
-	gphoto2? ( media-gfx/gphoto2 )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/flphoto-1.3.1-glibc28.patch
-	### Patch to fix segfault on PowerPC
-	epatch "${FILESDIR}"/espmsg.patch
-}
-
-src_compile() {
-	econf --with-docdir=/usr/share/doc/${PF} || die
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/album.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild b/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild
index 65ad3b18801e..cdaf4250ece6 100644
--- a/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild
+++ b/media-gfx/flphoto/flphoto-1.3.1-r2.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-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.7 2011/09/14 13:34:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flphoto/flphoto-1.3.1-r2.ebuild,v 1.8 2012/01/05 18:20:25 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime
@@ -14,11 +14,11 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="cups debug gphoto2 nls"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0
 	virtual/jpeg
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.2:0
 	sys-libs/zlib
-	x11-libs/fltk:1
+	>=x11-libs/fltk-1.1:1
 	x11-libs/libX11
 	x11-misc/shared-mime-info
 	cups? ( net-print/cups )