Fix dependencies (#235646) and add missing use flags (#235144).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 28 insertions, 44 deletions

diff --git a/net-p2p/lince/ChangeLog b/net-p2p/lince/ChangeLog
index 993b9ba48ad8..cb84138e2b4e 100644
--- a/net-p2p/lince/ChangeLog
+++ b/net-p2p/lince/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/lince
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lince/ChangeLog,v 1.12 2008/08/17 16:18:15 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lince/ChangeLog,v 1.13 2008/08/25 10:47:05 coldwind Exp $
+
+*lince-1.0_rc1-r1 (25 Aug 2008)
+
+  25 Aug 2008; Santiago M. Mola <coldwind@gentoo.org> metadata.xml,
+  -lince-0.99.4.ebuild, -lince-1.0_rc1.ebuild, +lince-1.0_rc1-r1.ebuild:
+  Fix dependencies (#235646) and add missing use flags (#235144).
 
 *lince-1.0_rc1 (17 Aug 2008)
 
diff --git a/net-p2p/lince/Manifest b/net-p2p/lince/Manifest
index bdd27a227a12..302cc76d3a16 100644
--- a/net-p2p/lince/Manifest
+++ b/net-p2p/lince/Manifest
@@ -1,6 +1,4 @@
-DIST Lince-0.99.4.tar.gz 429879 RMD160 d6e25eaf9b51489afd298f11bfa0dcfa95a38465 SHA1 0ff5b1d233e0b4cea9637a44aca135fbaf8cec3a SHA256 c005dccdd67f4cf84553957f0aff2e22d9b9f7fe1d012d34b5ba6db1fd1ee75a
 DIST Lince-1.0-rc1.tar.gz 681993 RMD160 b0df857273368e5ffbdb0848e990f128f4315a0a SHA1 729f65c1180560057abad460e214641c6d3919a1 SHA256 98d45fc4d139b1d299d21d1b6fd5debbc5b099c4f9b41ebcdcc58bf942c0b382
-EBUILD lince-0.99.4.ebuild 728 RMD160 d1ff81522e4291f1e3439217f8d43f8dae916649 SHA1 1d7ecb54950ea1ed29453a1c7be7e831c6566076 SHA256 05feaecec065e2a19994001a6f6853383d18cfd7896b83a5cb45d2f0bd51b62f
-EBUILD lince-1.0_rc1.ebuild 750 RMD160 a8d84b892d54a0972339b5d87b47cccbb5378a53 SHA1 0d96cbe02e68742bbbf9bce58b80243062255fee SHA256 9d615562867b914aa3bfb27301e6db9625956c1eca1ef6d2ef32a57be6c9e370
-MISC ChangeLog 1822 RMD160 37270b26c58336edf91b70063be8b77f3ed9073a SHA1 653efad89200a2588ab6e99e894308e420564a65 SHA256 b40b2471e12e85108d0c508c62328fc1f1a7490e19d2bb18bf22378e3b2a813e
+EBUILD lince-1.0_rc1-r1.ebuild 1003 RMD160 cc318b1ae985825e0cd4c35411ef09619f954c1e SHA1 71b5c2d05722b337e170b9fd59e90f42b337edd1 SHA256 b1d37dbf239a3cca8eed2b0e927919fb3d150c622ef8eb126781cc511b91cd42
+MISC ChangeLog 2063 RMD160 b9de55c9c539db1be4e5e988886b70b9f15fd9c9 SHA1 b09cba33c8ecf42bfe28923b50093211847eef20 SHA256 98a4dfaf49540e073397c586586ffb34ac6442d24aaab164c15dec56e2a007c6
 MISC metadata.xml 863 RMD160 d7c862d6f880e531774f901b82f5e7170f7567a6 SHA1 ff186ca589ce56290f761c4e2e56550d050100b1 SHA256 8a7440b0412b03110f8e13149a6f5b281859e5413a6bf82e41ac04b5f196e1f0
diff --git a/net-p2p/lince/lince-0.99.4.ebuild b/net-p2p/lince/lince-0.99.4.ebuild
deleted file mode 100644
index 030d1c759592..000000000000
--- a/net-p2p/lince/lince-0.99.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lince/lince-0.99.4.ebuild,v 1.2 2008/06/19 14:21:51 coldwind Exp $
-
-EAPI="1"
-
-MY_P="Lince-${PV}"
-
-DESCRIPTION="a light, powerfull and full feature gtkmm bittorrent client"
-SRC_URI="mirror://sourceforge/lincetorrent/${MY_P}.tar.gz"
-HOMEPAGE="http://lincetorrent.sourceforge.net"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	x11-libs/cairo
-	>=net-libs/rb_libtorrent-0.13
-	dev-libs/libxml2
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/net-p2p/lince/lince-1.0_rc1.ebuild b/net-p2p/lince/lince-1.0_rc1-r1.ebuild
index fd92c3081eeb..b691e3a09373 100644
--- a/net-p2p/lince/lince-1.0_rc1.ebuild
+++ b/net-p2p/lince/lince-1.0_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lince/lince-1.0_rc1.ebuild,v 1.1 2008/08/17 16:18:15 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lince/lince-1.0_rc1-r1.ebuild,v 1.1 2008/08/25 10:47:05 coldwind Exp $
 
 EAPI="1"
 
@@ -11,21 +11,31 @@ DESCRIPTION="a light, powerfull and full feature gtkmm bittorrent client"
 SRC_URI="mirror://sourceforge/lincetorrent/${MY_P}.tar.gz"
 HOMEPAGE="http://lincetorrent.sourceforge.net"
 
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="dbus libnotify"
+
 RDEPEND="dev-cpp/gtkmm:2.4
-	x11-libs/cairo
+	dev-cpp/cairomm
+	>=dev-cpp/glibmm-2.16
 	>=net-libs/rb_libtorrent-0.13
 	dev-libs/libxml2
-	sys-devel/gettext"
+	sys-devel/gettext
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )"
 DEPEND="${RDEPEND}
 	dev-util/intltool"
 
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
 S=${WORKDIR}/${MY_P}
 
+src_compile() {
+	econf \
+		$(use_with dbus) \
+		$(use_with libnotify) || die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install () {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 }