From: Daniel Gryniewicz Date: Mon, 20 Nov 2006 23:07:40 +0000 (+0000) Subject: cleanup versions and fix dbus deps for bug #155282 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c84186a08a8375c000856d3da529a91a8df68acf;p=gentoo.git cleanup versions and fix dbus deps for bug #155282 Package-Manager: portage-2.1.2_rc1-r7 --- diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest index abef509cfbe3..6c2b961e77e4 100644 --- a/net-news/liferea/Manifest +++ b/net-news/liferea/Manifest @@ -14,43 +14,24 @@ MD5 3a20454520ddb0c23157591a24516972 files/liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae30649123304 files/liferea-1.1.0-libnotify.patch 552 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/liferea-1.1.0-libnotify.patch 552 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4 -DIST liferea-1.0.22.tar.gz 1571378 RMD160 1a4fcdad290eb994e27ddcce29da99617f9fad81 SHA1 0a8f7674d93808f45a07e305f81f96d69fc6aca6 SHA256 30b54efb7da7863f5363014cc17c9b4b583fc4835c78e1b5540f50612f4362b8 -DIST liferea-1.0.23.tar.gz 1571355 RMD160 fc798dad8981fc205157754c8b268e5ff4d38bd1 SHA1 e637ea2c979b573ae8f8e931e85d45be7649187c SHA256 b94caa271f4ff7fd7254d30a255b1c54b03c4bb2fbe795979967eec16c38b432 DIST liferea-1.0.24.tar.gz 1572698 RMD160 53d4e332373563b1a813f342d690f28722a5d867 SHA1 1c486d559796ab921dd4dd858ba03ab0c46f62f1 SHA256 00218636ddae880d7e409435332a754316ead94f2af3aad53c9e5f2106f05964 -DIST liferea-1.1.9b.tar.gz 1171943 RMD160 6ef65405f2f322fd17165af058460f06f9a9a6f1 SHA1 c7d45c63145234564e9acbb06aa5dccc567045c6 SHA256 85f2c74a3ecb91b8a975820c3fea20b183780a187303d5f6eaee069f1feb0d74 DIST liferea-1.2-RC1.tar.gz 1226770 RMD160 e7edd8ee63600babc5c4a01a9b72941b22254567 SHA1 583eba352e7fac25b2675cfa56ba8c8bbe1c5e2c SHA256 f9bcd9e31c3d6bebfaf5114d422cba19a7be31b054c6074193a7ee55f715d6bb -EBUILD liferea-1.0.16.ebuild 1721 RMD160 715c6a193c2cc41c044eca8f96cb270b5d2dd87a SHA1 86e2066446ca4c7709a8b3c9674c41d406e65b62 SHA256 6f3e92daae8fcd340f02fcfb6b296744f560672efe30c9d1218436c1fd7a0945 -MD5 e9fb6c5a6b90b0978bda65c61cd9a2f1 liferea-1.0.16.ebuild 1721 -RMD160 715c6a193c2cc41c044eca8f96cb270b5d2dd87a liferea-1.0.16.ebuild 1721 -SHA256 6f3e92daae8fcd340f02fcfb6b296744f560672efe30c9d1218436c1fd7a0945 liferea-1.0.16.ebuild 1721 -EBUILD liferea-1.0.22-r1.ebuild 1769 RMD160 6208d220b72912efc1acbaefbb924dfe1ec1e798 SHA1 57603f9459327b549092dc6a8905242b6d261c44 SHA256 157242b9094791e11b7048e6257278b4a20014881f5d3d4783c7df1dfdd51fec -MD5 d820fd85de76834f40fd18cbe9a27138 liferea-1.0.22-r1.ebuild 1769 -RMD160 6208d220b72912efc1acbaefbb924dfe1ec1e798 liferea-1.0.22-r1.ebuild 1769 -SHA256 157242b9094791e11b7048e6257278b4a20014881f5d3d4783c7df1dfdd51fec liferea-1.0.22-r1.ebuild 1769 -EBUILD liferea-1.0.23.ebuild 1774 RMD160 02bbfa17e013d9609cdcc16be4b5a282042173fd SHA1 9b791539030a0b4e55a36e7f2f2718375ba1c018 SHA256 58d58e18f8d9d67bb31938c617f6c9ede29674e47a417d5e3522d14798a997ec -MD5 187e8d0623ac52c7c3577bfc9465fc8d liferea-1.0.23.ebuild 1774 -RMD160 02bbfa17e013d9609cdcc16be4b5a282042173fd liferea-1.0.23.ebuild 1774 -SHA256 58d58e18f8d9d67bb31938c617f6c9ede29674e47a417d5e3522d14798a997ec liferea-1.0.23.ebuild 1774 -EBUILD liferea-1.0.24.ebuild 1774 RMD160 a2d6db689cdc23e594b412dbd575bdc95e757cf9 SHA1 cd396767bce1d5b750d554569617ee80248f50b6 SHA256 ec7f827f0b3fd592850da4adfdeec6f12a6f6b7deb6a898c18d9a27c2f59e832 -MD5 a167fdd73a529f3b6d0ac5992a74344b liferea-1.0.24.ebuild 1774 -RMD160 a2d6db689cdc23e594b412dbd575bdc95e757cf9 liferea-1.0.24.ebuild 1774 -SHA256 ec7f827f0b3fd592850da4adfdeec6f12a6f6b7deb6a898c18d9a27c2f59e832 liferea-1.0.24.ebuild 1774 -EBUILD liferea-1.1.9-r1.ebuild 1925 RMD160 404eb5ade65878760ca840c1e2b724b2d50bc368 SHA1 b3e38972011cb86656c37531269ff0f230275967 SHA256 b844055625e78947306fccf37a75778c7c044ba9a7b44cbde67b3a383b157ca5 -MD5 c0990183d3c9d09f33d9d547c4be0fa2 liferea-1.1.9-r1.ebuild 1925 -RMD160 404eb5ade65878760ca840c1e2b724b2d50bc368 liferea-1.1.9-r1.ebuild 1925 -SHA256 b844055625e78947306fccf37a75778c7c044ba9a7b44cbde67b3a383b157ca5 liferea-1.1.9-r1.ebuild 1925 -EBUILD liferea-1.2_rc1-r1.ebuild 2131 RMD160 53efbc3932a689a5e646a831520265c7ec87ca4b SHA1 be7a1fb32c5e6650cfd013894a32fd6930bc9dae SHA256 f5149b4821c38ca67d29f6d1c135744fc28970204d5689b95c417777ebb1d554 -MD5 28b9ec649926a36fc65dd19ff40e62ec liferea-1.2_rc1-r1.ebuild 2131 -RMD160 53efbc3932a689a5e646a831520265c7ec87ca4b liferea-1.2_rc1-r1.ebuild 2131 -SHA256 f5149b4821c38ca67d29f6d1c135744fc28970204d5689b95c417777ebb1d554 liferea-1.2_rc1-r1.ebuild 2131 -EBUILD liferea-1.2_rc1.ebuild 1966 RMD160 51a81e5b1f54e901565c2c49aa3a00a5602d273c SHA1 72d59c86d312a39ba825312aed096d38f9a7de02 SHA256 209f674c9bf0478ffc2273dc2714e8bb0b2616647a7541b10c8271916b62d31d -MD5 6494070c8271034a24a6c610ea445bb0 liferea-1.2_rc1.ebuild 1966 -RMD160 51a81e5b1f54e901565c2c49aa3a00a5602d273c liferea-1.2_rc1.ebuild 1966 -SHA256 209f674c9bf0478ffc2273dc2714e8bb0b2616647a7541b10c8271916b62d31d liferea-1.2_rc1.ebuild 1966 -MISC ChangeLog 14644 RMD160 e5b2c54dae4f1279072920963b8fa616c9e426c4 SHA1 5f7bdcc15b932db289c2b1ac747bff5c7992d7f1 SHA256 c3663aaa5dfaefdb8b9c192ab2be8cc91813af7633afa9c396f9f68518890e60 -MD5 af54e1fa218a19ae30b7c272708e2952 ChangeLog 14644 -RMD160 e5b2c54dae4f1279072920963b8fa616c9e426c4 ChangeLog 14644 -SHA256 c3663aaa5dfaefdb8b9c192ab2be8cc91813af7633afa9c396f9f68518890e60 ChangeLog 14644 +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 +SHA256 7f1821ca36162fc7f437716fa5c4f0980b45a0e1daa8ce8d40a9060dd36f5cc9 liferea-1.0.16.ebuild 1781 +EBUILD liferea-1.0.24.ebuild 1834 RMD160 1f56217ece005a54a6d63a501390d9bea5e87448 SHA1 f8c9df7bccbfaf7f4239ccc932afd304adebe74c SHA256 ee30e1ebb6abad6fdf415725d85f2809bd64c1157fd1261b58f4cdccf47a830f +MD5 769ce59241a126cac70b05210d88c070 liferea-1.0.24.ebuild 1834 +RMD160 1f56217ece005a54a6d63a501390d9bea5e87448 liferea-1.0.24.ebuild 1834 +SHA256 ee30e1ebb6abad6fdf415725d85f2809bd64c1157fd1261b58f4cdccf47a830f liferea-1.0.24.ebuild 1834 +EBUILD liferea-1.2_rc1-r1.ebuild 2191 RMD160 44e9e8d8cc16c63fd40d1072a77dc24886cc75e0 SHA1 07dafbc4c4578a4087d4a9eccf186e96fa2da4d0 SHA256 deeadfda45e147bc9f5893236474bc28fea3fe6b99b603024ce5950d75c31c2b +MD5 c6e1425b5b518b38eedf5eebdd373c7d liferea-1.2_rc1-r1.ebuild 2191 +RMD160 44e9e8d8cc16c63fd40d1072a77dc24886cc75e0 liferea-1.2_rc1-r1.ebuild 2191 +SHA256 deeadfda45e147bc9f5893236474bc28fea3fe6b99b603024ce5950d75c31c2b liferea-1.2_rc1-r1.ebuild 2191 +MISC ChangeLog 14930 RMD160 6f603c895578a38d020df5ffdb1826d832f7002d SHA1 e38fa74a197036caaa555f9ed51de3e4db228228 SHA256 593206a8217f721555738e2046183044ad44a4dab2e7e03f3b02d98f012d94e6 +MD5 a414a126f66117d130ff1db3137cf345 ChangeLog 14930 +RMD160 6f603c895578a38d020df5ffdb1826d832f7002d ChangeLog 14930 +SHA256 593206a8217f721555738e2046183044ad44a4dab2e7e03f3b02d98f012d94e6 ChangeLog 14930 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234 @@ -58,28 +39,16 @@ SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f metadata MD5 1a78a66c9be7d1687ab62c3e50da168a files/digest-liferea-1.0.16 247 RMD160 03d34654c5f02746f9c39d399df20c19017b3727 files/digest-liferea-1.0.16 247 SHA256 665ce96de96f78e6071d90c65196782710a5f736e599ae3cc61cf1ec70dc8d24 files/digest-liferea-1.0.16 247 -MD5 41e9fc9ca80976fd54fa0d089e9ab5d6 files/digest-liferea-1.0.22-r1 247 -RMD160 98ef81236dc3f28f3c66e5facc4c1fe27a4faff2 files/digest-liferea-1.0.22-r1 247 -SHA256 4952db563bc4fda3ac1981b97be44d85bb6af85bdf324e930543b4917478543c files/digest-liferea-1.0.22-r1 247 -MD5 121c52f45d6530bc97913b688b91ce7c files/digest-liferea-1.0.23 247 -RMD160 635e2bdf0e3f330a5043d1524315339303332243 files/digest-liferea-1.0.23 247 -SHA256 ce13d2bde3ae3f7f543630c19606819a8e51f2d6e0a3857b2b4663bfc0f6ad39 files/digest-liferea-1.0.23 247 MD5 0466adafefcf633997604b59182915d2 files/digest-liferea-1.0.24 247 RMD160 f05de6c55ee2573c7a04ed45afb380a106c30732 files/digest-liferea-1.0.24 247 SHA256 9de48950eb66e768e3163a3fd128a197198bc47c4b041d0afc77679765dd1bf6 files/digest-liferea-1.0.24 247 -MD5 1236ef79902564427f63f27765483b72 files/digest-liferea-1.1.9-r1 247 -RMD160 ac5f088433f6b5a0904902ad103ee2425bc38c95 files/digest-liferea-1.1.9-r1 247 -SHA256 ff429e9d8f61c00825102b68dd4c504054e6ed0a9ecad6f9a295acaf6cbc854b files/digest-liferea-1.1.9-r1 247 -MD5 f5e7bf64c98cec2afeadc2856a569aa3 files/digest-liferea-1.2_rc1 250 -RMD160 8c593975578e396422b9ab143014bcbd9575742a files/digest-liferea-1.2_rc1 250 -SHA256 0e2b5e17f6073d48d14067334cb45d2c6ee4e802ee14ff27d63847bad5d5bf3a files/digest-liferea-1.2_rc1 250 MD5 f5e7bf64c98cec2afeadc2856a569aa3 files/digest-liferea-1.2_rc1-r1 250 RMD160 8c593975578e396422b9ab143014bcbd9575742a files/digest-liferea-1.2_rc1-r1 250 SHA256 0e2b5e17f6073d48d14067334cb45d2c6ee4e802ee14ff27d63847bad5d5bf3a files/digest-liferea-1.2_rc1-r1 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) -iD8DBQFFWMBoomPajV0RnrERAjwHAJ40Io2ZfOZbL9039QrnUAottcDFqQCeKZ8+ -VsPIcskIy8MnDUrk3sK0FZQ= -=G6ng +iD8DBQFFYjUvomPajV0RnrERAjnMAJ9fnw0Wez7jWELDCFB+xt70RPmJnQCfStnX +T17V1T/VT5EggSjf1Oyb/Uo= +=iiSa -----END PGP SIGNATURE----- diff --git a/net-news/liferea/files/digest-liferea-1.0.22-r1 b/net-news/liferea/files/digest-liferea-1.0.22-r1 deleted file mode 100644 index 145513b93f78..000000000000 --- a/net-news/liferea/files/digest-liferea-1.0.22-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 dd252e0833ad745d6f7ee3a0b2114bff liferea-1.0.22.tar.gz 1571378 -RMD160 1a4fcdad290eb994e27ddcce29da99617f9fad81 liferea-1.0.22.tar.gz 1571378 -SHA256 30b54efb7da7863f5363014cc17c9b4b583fc4835c78e1b5540f50612f4362b8 liferea-1.0.22.tar.gz 1571378 diff --git a/net-news/liferea/files/digest-liferea-1.0.23 b/net-news/liferea/files/digest-liferea-1.0.23 deleted file mode 100644 index 3705216bb02d..000000000000 --- a/net-news/liferea/files/digest-liferea-1.0.23 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f3f5499e4b8a032cdb595eb47255829a liferea-1.0.23.tar.gz 1571355 -RMD160 fc798dad8981fc205157754c8b268e5ff4d38bd1 liferea-1.0.23.tar.gz 1571355 -SHA256 b94caa271f4ff7fd7254d30a255b1c54b03c4bb2fbe795979967eec16c38b432 liferea-1.0.23.tar.gz 1571355 diff --git a/net-news/liferea/files/digest-liferea-1.1.9-r1 b/net-news/liferea/files/digest-liferea-1.1.9-r1 deleted file mode 100644 index 500fbb6dab4f..000000000000 --- a/net-news/liferea/files/digest-liferea-1.1.9-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cb483c08fc1d2d2d9c3da30e95ee2214 liferea-1.1.9b.tar.gz 1171943 -RMD160 6ef65405f2f322fd17165af058460f06f9a9a6f1 liferea-1.1.9b.tar.gz 1171943 -SHA256 85f2c74a3ecb91b8a975820c3fea20b183780a187303d5f6eaee069f1feb0d74 liferea-1.1.9b.tar.gz 1171943 diff --git a/net-news/liferea/files/digest-liferea-1.2_rc1 b/net-news/liferea/files/digest-liferea-1.2_rc1 deleted file mode 100644 index 4717ac39d6f0..000000000000 --- a/net-news/liferea/files/digest-liferea-1.2_rc1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 48225f5b3d923a9fb14360709dfc4c2a liferea-1.2-RC1.tar.gz 1226770 -RMD160 e7edd8ee63600babc5c4a01a9b72941b22254567 liferea-1.2-RC1.tar.gz 1226770 -SHA256 f9bcd9e31c3d6bebfaf5114d422cba19a7be31b054c6074193a7ee55f715d6bb liferea-1.2-RC1.tar.gz 1226770 diff --git a/net-news/liferea/liferea-1.0.22-r1.ebuild b/net-news/liferea/liferea-1.0.22-r1.ebuild deleted file mode 100644 index 5e2b138b034d..000000000000 --- a/net-news/liferea/liferea-1.0.22-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.22-r1.ebuild,v 1.3 2006/11/04 22:02:37 dang Exp $ - -inherit gnome2 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 ~ppc64 ~sparc ~x86" -IUSE="dbus firefox gtkhtml seamonkey" - -RDEPEND=">=x11-libs/gtk+-2.4.0 - x11-libs/pango - >=gnome-base/gconf-2 - >=dev-libs/libxml2-2.5.10 - firefox? ( www-client/mozilla-firefox ) - !firefox? ( seamonkey? ( www-client/seamonkey ) ) - gtkhtml? ( =gnome-extra/gtkhtml-2* ) - !seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) ) - gnome-base/libgnome - dbus? ( >=sys-apps/dbus-0.30 )" - -# libgnome dep is for gnome-open; it's not in configure.ac - -DEPEND="${RDEPEND} - dev-util/pkgconfig - =sys-devel/automake-1.7*" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - - # if you don't choose a gecko to use, we will automatically - # use gtkhtml2 as the backend. - if ! use seamonkey && ! use firefox || use gtkhtml ; then - G2CONF="${G2CONF} --enable-gtkhtml2" - else - G2CONF="${G2CONF} --disable-gtkhtml2" - fi - - # we prefer firefox over seamonkey - if 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)" -} - -src_unpack() { - gnome2_src_unpack - - # Fix add-feed check; bug #147521 - epatch "${FILESDIR}/${P}-add-feed.patch" -} - -src_install() { - gnome2_src_install - rm -f ${D}/usr/bin/${PN} - mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN} -} diff --git a/net-news/liferea/liferea-1.0.23.ebuild b/net-news/liferea/liferea-1.0.23.ebuild deleted file mode 100644 index eef2d11490ee..000000000000 --- a/net-news/liferea/liferea-1.0.23.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.23.ebuild,v 1.3 2006/11/04 22:02:37 dang Exp $ - -inherit gnome2 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 ~ppc64 ~sparc ~x86" -IUSE="dbus firefox gtkhtml seamonkey" - -RDEPEND=">=x11-libs/gtk+-2.4.0 - x11-libs/pango - >=gnome-base/gconf-2 - >=dev-libs/libxml2-2.5.10 - firefox? ( www-client/mozilla-firefox ) - !firefox? ( seamonkey? ( www-client/seamonkey ) ) - gtkhtml? ( =gnome-extra/gtkhtml-2* ) - !seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) ) - gnome-base/libgnome - dbus? ( >=sys-apps/dbus-0.30 )" - -# libgnome dep is for gnome-open; it's not in configure.ac - -DEPEND="${RDEPEND} - dev-util/pkgconfig - =sys-devel/automake-1.7*" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - - # if you don't choose a gecko to use, we will automatically - # use gtkhtml2 as the backend. - if ! use seamonkey && ! use firefox || use gtkhtml ; then - G2CONF="${G2CONF} --enable-gtkhtml2" - else - G2CONF="${G2CONF} --disable-gtkhtml2" - fi - - # we prefer firefox over seamonkey - if 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)" -} - -src_unpack() { - gnome2_src_unpack - - # Fix add-feed check; bug #147521 - epatch "${FILESDIR}/${PN}-1.0.22-add-feed.patch" -} - -src_install() { - gnome2_src_install - rm -f ${D}/usr/bin/${PN} - mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN} -} diff --git a/net-news/liferea/liferea-1.1.9-r1.ebuild b/net-news/liferea/liferea-1.1.9-r1.ebuild deleted file mode 100644 index 07e5562945ed..000000000000 --- a/net-news/liferea/liferea-1.1.9-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.1.9-r1.ebuild,v 1.2 2006/11/13 18:14:07 dang Exp $ - -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}b.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls" - -RDEPEND=">=x11-libs/gtk+-2.8 - x11-libs/pango - >=gnome-base/gconf-2 - >=dev-libs/libxml2-2.5.10 - dev-libs/libxslt - >=dev-libs/glib-2 - firefox? ( www-client/mozilla-firefox ) - !firefox? ( seamonkey? ( www-client/seamonkey ) ) - !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) - gtkhtml? ( =gnome-extra/gtkhtml-2* ) - dbus? ( >=sys-apps/dbus-0.30 ) - libnotify? ( >=x11-libs/libnotify-0.3.2 ) - gnutls? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35 - =sys-devel/automake-1.7*" - -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() { - # if you don't choose a gecko to use, we will automatically - # use gtkhtml2 as the backend. - if ! use seamonkey && ! use firefox || use gtkhtml ; then - G2CONF="${G2CONF} --enable-gtkhtml2" - else - G2CONF="${G2CONF} --disable-gtkhtml2" - fi - - # we prefer firefox over seamonkey - if 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} -} diff --git a/net-news/liferea/liferea-1.2_rc1.ebuild b/net-news/liferea/liferea-1.2_rc1.ebuild deleted file mode 100644 index 0db1458f2713..000000000000 --- a/net-news/liferea/liferea-1.2_rc1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1.ebuild,v 1.2 2006/11/13 18:14:07 dang Exp $ - -inherit gnome2 flag-o-matic eutils autotools - -MY_P=${PN}-1.2-RC1 -DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds" -HOMEPAGE="http://liferea.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls" - -RDEPEND=">=x11-libs/gtk+-2.8 - x11-libs/pango - >=gnome-base/gconf-2 - >=dev-libs/libxml2-2.5.10 - dev-libs/libxslt - >=dev-libs/glib-2 - firefox? ( www-client/mozilla-firefox ) - !firefox? ( seamonkey? ( www-client/seamonkey ) ) - !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) - gtkhtml? ( =gnome-extra/gtkhtml-2* ) - dbus? ( >=sys-apps/dbus-0.30 ) - libnotify? ( >=x11-libs/libnotify-0.3.2 ) - gnutls? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35 - =sys-devel/automake-1.7*" - -DOCS="AUTHORS ChangeLog NEWS README" - -S=${WORKDIR}/${MY_P} -src_unpack() { - unpack ${A} - - cd ${S} - - epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch" - - eautoreconf || die "Autoreconf failed" -} - -pkg_setup() { - # if you don't choose a gecko to use, we will automatically - # use gtkhtml2 as the backend. - if ! use seamonkey && ! use firefox || use gtkhtml ; then - G2CONF="${G2CONF} --enable-gtkhtml2" - else - G2CONF="${G2CONF} --disable-gtkhtml2" - fi - - # we prefer firefox over seamonkey - if 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} -}