media-gfx/frogr: bump to 0.5, remove flickcurl

5 files changed, 39 insertions, 61 deletions

diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 3298046..e8ca2b7 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,2 +1,2 @@
-DIST frogr-0.1.1.tar.bz2 157588 RMD160 34715fb9bd390e1a3eefe325c08029ec871c7425 SHA1 7bdf131d139929edaf4d7810ce061c6e26427338 SHA256 93a83e3ada377766d19ec2839104978520ccf4df59231d3d454257df84acc61c
-EBUILD frogr-0.1.1.ebuild 569 RMD160 309f50e25add7825265bd3af23a195839f408aa7 SHA1 861805acc14bcd3ed91d27e611eb942e0d2de81d SHA256 f6a3c2edd716fcda8275eadf0767f70f4c1d9d4f18cad16accb1e529a6d0388e
+DIST frogr-0.5.tar.xz 290016 RMD160 47cd5a8d8a2d2ad53e7fea90f4ef64c68655fd50 SHA1 90df1bf9e5cdd62ebc1a31db7e03956ed4a03cb0 SHA256 30b448d9a3c0ef8f13aa1564212b6a5c0afb8af7ce5222bce0d35d963d5fb3f0
+EBUILD frogr-0.5.ebuild 782 RMD160 e9f901746eb6ffbf074a7e86a6035221ef085d1d SHA1 274c90557fe8dc3f6baf412958c94c0f8948f33b SHA256 61b6cc0905abdb07125f795a58f1db2a92175c39009992219d348565db3553da
diff --git a/media-gfx/frogr/frogr-0.1.1.ebuild b/media-gfx/frogr/frogr-0.1.1.ebuild
deleted file mode 100644
index 1f240af..0000000
--- a/media-gfx/frogr/frogr-0.1.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="GTK+ flickr client"
-HOMEPAGE="http://code.google.com/p/frogr/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.14
-	>=net-misc/flickcurl-1.0
-	>=dev-libs/libxml2-2.6.8"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README TODO NEWS AUTHORS THANKS ChangeLog
-}
diff --git a/media-gfx/frogr/frogr-0.5.ebuild b/media-gfx/frogr/frogr-0.5.ebuild
new file mode 100644
index 0000000..ba65fcf
--- /dev/null
+++ b/media-gfx/frogr/frogr-0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+GNOME_TARBALL_SUFFIX="xz"
+
+inherit gnome2
+
+DESCRIPTION="A Flickr client for GNOME"
+HOMEPAGE="https://live.gnome.org/Frogr"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2.6.8:2
+	>=x11-libs/gtk+-3.0:3
+	>=media-libs/libexif-0.6.14
+	>=net-libs/libsoup-2.24:2.4"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext"
+
+src_prepare() {
+	# Remove stupid CFLAGS, recheck with every bump
+	sed -e '/CFLAGS/s/\(-Werror\)\? -g. -O.//' \
+		-i configure
+
+	DOCS="AUTHORS ChangeLog README MAINTAINERS NEWS THANKS TODO TRANSLATORS"
+	G2CONF="${G2CONF}
+		--with-gtk=3.0"
+
+	gnome2_src_prepare
+}
diff --git a/net-misc/flickcurl/Manifest b/net-misc/flickcurl/Manifest
deleted file mode 100644
index a4c0f89..0000000
--- a/net-misc/flickcurl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST flickcurl-1.13.tar.gz 726181 RMD160 e5140825ff65d537762286e1929f4f33bb816ba1 SHA1 c1834ab66b05891c22131d6868be0fcd7d68bb96 SHA256 c49ffda64229bc3c30d2180767705931cb8d74f6c6f78e57b1f343f9928cd0d2
-EBUILD flickcurl-1.13.ebuild 743 RMD160 dddc3a94de064cfcf89750c50b9d0bf28733f0fb SHA1 da2e88ff3dbe41bbe3693f7f3f60df96bb2b4b75 SHA256 f1ef1f8170548b7ad17b4473f193a6bc90b6fe86120e5be4c1a8e322f882422b
diff --git a/net-misc/flickcurl/flickcurl-1.13.ebuild b/net-misc/flickcurl/flickcurl-1.13.ebuild
deleted file mode 100644
index 300e19d..0000000
--- a/net-misc/flickcurl/flickcurl-1.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="C library for the Flickr API"
-HOMEPAGE="http://librdf.org/flickcurl/"
-SRC_URI="http://download.dajobe.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +raptor"
-
-RDEPEND=">=dev-libs/libxml2-2.6.8
-	>=net-misc/curl-7.10.0
-	raptor? ( >=media-libs/raptor-1.4.16 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.3 )"
-
-src_configure() {
-	econf --enable-shave \
-		--enable-capture \
-		$(use_with raptor) \
-		$(use_enable doc gtk-doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}