old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 9 insertions, 63 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/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 )