Bump to 1.2.5

Package-Manager: portage-2.1.2-r7

4 files changed, 127 insertions, 9 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 2258b0d19e52..cbe00592b9c1 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.83 2007/01/22 21:14:46 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.84 2007/02/04 21:18:42 dang Exp $
+
+*liferea-1.2.5 (04 Feb 2007)
+
+  04 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> +liferea-1.2.5.ebuild:
+  Bump to 1.2.5
+
+  04 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
+  Bump to 1.2.5
+  	* Disabling GtkHTML2 support for x86_64 platforms.
+  	  Maintainers: please do discontinue any GtkHTML2 support
+  	  on such platforms if possible, as it cause only trouble!
+  	* Removed console warning that was given on each startup
+  	  as long as social bookmarking site was not set.
+  	* Fixes Debian #408475: liferea wrapper script is brittle, 
+  	  depends on $0 (report and patch by jrodman)
+  	* Fixes a type problem in the Digest authentication that 
+  	  caused crashes on AMD64 (SF #1636563)
 
   22 Jan 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
   Bump to 1.2.4
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index b56b1a5b53cc..7f0d2c0483d2 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -19,6 +19,7 @@ DIST liferea-1.2-RC5.tar.gz 1307072 RMD160 bd489325333483567e7c37d8ed05c31ab88c7
 DIST liferea-1.2.0.tar.gz 1307305 RMD160 4a73c8c649df6e046436151e132134b5f28a99e7 SHA1 ccd67104a21a4f78912b0a7155a077994e9d4219 SHA256 aaf607fea8db256adce02a8bcc032f90d7491bf2ca74d0579331bc08d293c22d
 DIST liferea-1.2.2.tar.gz 1307856 RMD160 921b4065013528a7125939fa22bb245e9e67552b SHA1 46f540e3bc670de7704b5bb3d81c19cb6060c786 SHA256 70beabae91cad2339ec4cc1dbb685acde004da0c90c1a1ab2503ff773ac6877e
 DIST liferea-1.2.4.tar.gz 1347546 RMD160 206daa8aea6f1ecfcfd6b43632164ffa79769349 SHA1 ad6ea9ddc49ade78e8a41d99cc74deb3f1778e77 SHA256 e6a470eca048c5c43378455cc33eaac0b5261c5ffde30743ad91674e555f8896
+DIST liferea-1.2.5.tar.gz 1375966 RMD160 078b3f7b196d59f90292aeb89f5d7f771d5e97a6 SHA1 32602eb0f5544eea1ca0835d72554755430e2915 SHA256 9175d573d6d00af01e198e580cce95b8a25dcb9c225f14c4f356895cfe4f82d6
 EBUILD liferea-1.0.16.ebuild 1781 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 SHA1 e39eaab188ef5cf800339fc7ecb224f6a5d98a5e SHA256 7f1821ca36162fc7f437716fa5c4f0980b45a0e1daa8ce8d40a9060dd36f5cc9
 MD5 63379fdc2f15c36a3961adc442c7f63d liferea-1.0.16.ebuild 1781
 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 liferea-1.0.16.ebuild 1781
@@ -39,14 +40,18 @@ EBUILD liferea-1.2.4.ebuild 2177 RMD160 a3dff1282928b124f290ce0b4987b7e86ff00ccc
 MD5 25cd170d1d06f8e93b14104c56a758c9 liferea-1.2.4.ebuild 2177
 RMD160 a3dff1282928b124f290ce0b4987b7e86ff00ccc liferea-1.2.4.ebuild 2177
 SHA256 04360970a7cc34833e301584451d6e8a983a51763a5785a925a4c08a9b703bb4 liferea-1.2.4.ebuild 2177
+EBUILD liferea-1.2.5.ebuild 2667 RMD160 baf23579a002765b35ea6466a832b3e7e2b84f5f SHA1 5e5c05144f87e5b9e15a8fb77a57e9f046df712a SHA256 3b12e073d0e9e27adae52ab244599b49b3ca4c55b949e96a3b6d122778bfeeac
+MD5 cd2f817cee60c33275fe150f68c2bc17 liferea-1.2.5.ebuild 2667
+RMD160 baf23579a002765b35ea6466a832b3e7e2b84f5f liferea-1.2.5.ebuild 2667
+SHA256 3b12e073d0e9e27adae52ab244599b49b3ca4c55b949e96a3b6d122778bfeeac liferea-1.2.5.ebuild 2667
 EBUILD liferea-1.2_rc5.ebuild 2199 RMD160 f056759af19662c7da77f437acdfbe0956ac6617 SHA1 01e4eb8253cf67f46b11df5c016dde2367337a9e SHA256 a9b489c1946935a71dba44767c4be543a3fc907752fbf3ddcda3ed5a6c2cb3eb
 MD5 07a30cb53c6d17da3c3e9b611e6fd0c3 liferea-1.2_rc5.ebuild 2199
 RMD160 f056759af19662c7da77f437acdfbe0956ac6617 liferea-1.2_rc5.ebuild 2199
 SHA256 a9b489c1946935a71dba44767c4be543a3fc907752fbf3ddcda3ed5a6c2cb3eb liferea-1.2_rc5.ebuild 2199
-MISC ChangeLog 18338 RMD160 52702a90bd8c265f564bb74004139c0cc2068588 SHA1 82afc919ea065986cb1118a8a8a8e4a6921e2e75 SHA256 66a8157643baf17dfd7134fc0bf14aadb18c26ab715849436f3b097644ee33a3
-MD5 c508fe9b4d11fbc9bd66d40e6f041193 ChangeLog 18338
-RMD160 52702a90bd8c265f564bb74004139c0cc2068588 ChangeLog 18338
-SHA256 66a8157643baf17dfd7134fc0bf14aadb18c26ab715849436f3b097644ee33a3 ChangeLog 18338
+MISC ChangeLog 19044 RMD160 e3e3fbb6c71173f16c9a7e75564581750fb6a81a SHA1 c63bfb354fbc39fb7c9b9508e099a93251076746 SHA256 f2e671f432af9df4493bf0b2f70d9ba259876afe9c8bf38ab21f54c70d701e4d
+MD5 46ce8cf402ca755d5badb20522cda4c7 ChangeLog 19044
+RMD160 e3e3fbb6c71173f16c9a7e75564581750fb6a81a ChangeLog 19044
+SHA256 f2e671f432af9df4493bf0b2f70d9ba259876afe9c8bf38ab21f54c70d701e4d ChangeLog 19044
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -66,13 +71,16 @@ SHA256 a08c8b9680a15fcac1cd25861bc91f1c3e299d6726cb2bf623adcefb9e28f8eb files/di
 MD5 1ac6d97d38496b72e5033141f828f698 files/digest-liferea-1.2.4 244
 RMD160 3a993122625a6b9d2d5b0251de039b653ee5f685 files/digest-liferea-1.2.4 244
 SHA256 75fd98b91f045bd5e4844f8519af9749bc0803b8fba1d33cb081074d2b4f8616 files/digest-liferea-1.2.4 244
+MD5 85a69018d0fca9a78097701e2e143ffc files/digest-liferea-1.2.5 244
+RMD160 6578b59f3e0fc9a4c1c41591ecd364a528e6f358 files/digest-liferea-1.2.5 244
+SHA256 d6aae1b45bbc2627867069ddb353ebbe7d5235c6a7fbc0d30816c86bf583562d files/digest-liferea-1.2.5 244
 MD5 943824239a489227948e586d6d3ca29c files/digest-liferea-1.2_rc5 250
 RMD160 6697b054ebe1b163925110adb9689b10f4994b59 files/digest-liferea-1.2_rc5 250
 SHA256 0fb51a0ea40d02ea956d8c02cf3c89b91d5f78e161b977b272db817f9dc5c040 files/digest-liferea-1.2_rc5 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFtSmEomPajV0RnrERAhWuAJ9OZFPwsPWz+bZPJqomXjsXvTUivwCeK2rL
-7+VZeer9cEps5PgHgkD2Eco=
-=M6Te
+iD8DBQFFxk2pomPajV0RnrERAs5uAJ4q8E7Ao6cWMPTJxHrfW+PVdFF8rwCfSfSE
+ZT8RgfXmQ5nm0HRbRcMJzDs=
+=VQZt
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.2.5 b/net-news/liferea/files/digest-liferea-1.2.5
new file mode 100644
index 000000000000..27fa9d1d9c8a
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.5
@@ -0,0 +1,3 @@
+MD5 3b901a9c7942be39e975446795788f0c liferea-1.2.5.tar.gz 1375966
+RMD160 078b3f7b196d59f90292aeb89f5d7f771d5e97a6 liferea-1.2.5.tar.gz 1375966
+SHA256 9175d573d6d00af01e198e580cce95b8a25dcb9c225f14c4f356895cfe4f82d6 liferea-1.2.5.tar.gz 1375966
diff --git a/net-news/liferea/liferea-1.2.5.ebuild b/net-news/liferea/liferea-1.2.5.ebuild
new file mode 100644
index 000000000000..aa2e60af569e
--- /dev/null
+++ b/net-news/liferea/liferea-1.2.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.5.ebuild,v 1.1 2007/02/04 21:18:42 dang Exp $
+
+WANT_AUTOMAKE=1.7
+WANT_AUTOCONF=latest
+inherit gnome2 flag-o-matic eutils autotools
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
+
+RDEPEND=">=x11-libs/gtk+-2.8
+	x11-libs/pango
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2.6.27
+	>=dev-libs/libxslt-1.1.19
+	>=dev-libs/glib-2
+	xulrunner? ( net-libs/xulrunner )
+	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
+	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
+	!amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
+	)
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	gnutls? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
+
+	eautoreconf || die "Autoreconf failed"
+}
+
+pkg_setup() {
+	# On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
+	if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
+		elog "gtkhtml is no longer supported on amd64; you will need to select"
+		elog "one of the gecko backends to use liferea"
+		die "You must enable on of the gecko backends on amd64"
+	fi
+		
+	# if you don't choose a gecko to use, we will automatically
+	# use gtkhtml2 as the backend except on amd64 (where we failed above)
+	if ! use seamonkey && ! use firefox && ! use xulrunner && ! amd64 ; then
+		G2CONF="${G2CONF} --enable-gtkhtml2"
+	elif ! use amd64 && use gtkhtml ; then
+		G2CONF="${G2CONF} --enable-gtkhtml2"
+	else
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	fi
+
+	# we prefer xulrunner over firefox over seamonkey
+	if use xulrunner ; then
+		G2CONF="${G2CONF} --enable-xulrunner"
+	elif use firefox ; then
+		G2CONF="${G2CONF} --enable-gecko=firefox"
+	elif use seamonkey ; then
+		G2CONF="${G2CONF} --enable-gecko=seamonkey"
+	else
+		G2CONF="${G2CONF} --disable-gecko"
+	fi
+
+	G2CONF="${G2CONF} \
+		$(use_enable dbus) \
+		$(use_enable gnutls) \
+		$(use_enable libnotify)"
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f ${D}/usr/bin/${PN}
+	mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
+}