Fix automagic depedency for libindicate-qt, bug 348456

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

6 files changed, 58 insertions, 46 deletions

diff --git a/net-im/choqok/ChangeLog b/net-im/choqok/ChangeLog
index 0c6f6be5c31a..239b1a9a0b7d 100644
--- a/net-im/choqok/ChangeLog
+++ b/net-im/choqok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/choqok
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.14 2010/12/08 16:55:06 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.15 2011/01/13 06:59:29 tampakrap Exp $
+
+*choqok-0.9.98-r1 (13 Jan 2011)
+
+  13 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -files/choqok-0.9.55_qt47.patch, -choqok-0.9.92.ebuild,
+  -choqok-0.9.98.ebuild, +choqok-0.9.98-r1.ebuild,
+  +files/choqok-0.9.98-libindicate.patch:
+  Fix automagic depedency for libindicate-qt, bug 348456
 
 *choqok-0.9.98 (08 Dec 2010)
 
diff --git a/net-im/choqok/choqok-0.9.92.ebuild b/net-im/choqok/choqok-0.9.92.ebuild
deleted file mode 100644
index afde38310f08..000000000000
--- a/net-im/choqok/choqok-0.9.92.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.92.ebuild,v 1.1 2010/10/16 10:02:21 tampakrap Exp $
-
-EAPI=3
-
-KMNAME="extragear/network"
-
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
-	nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-	SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${P}.tar.bz2"
-fi
-
-inherit kde4-base
-
-DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
-HOMEPAGE="http://choqok.gnufolks.org/"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="dev-libs/qjson
-		>=dev-libs/qoauth-1.0.1"
-RDEPEND="${DEPEND}"
diff --git a/net-im/choqok/choqok-0.9.98.ebuild b/net-im/choqok/choqok-0.9.98-r1.ebuild
index 01e69766e833..0deea5cb11f7 100644
--- a/net-im/choqok/choqok-0.9.98.ebuild
+++ b/net-im/choqok/choqok-0.9.98-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.98.ebuild,v 1.1 2010/12/08 16:55:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.98-r1.ebuild,v 1.1 2011/01/13 06:59:29 tampakrap Exp $
 
 EAPI=3
 
@@ -19,8 +19,20 @@ HOMEPAGE="http://choqok.gnufolks.org/"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
 SLOT="4"
-IUSE="debug +handbook"
+IUSE="debug +handbook indicate"
 
 DEPEND="dev-libs/qjson
-		>=dev-libs/qoauth-1.0.1"
+		>=dev-libs/qoauth-1.0.1
+		indicate? ( dev-libs/libindicate-qt )
+"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libindicate.patch" )
+
+src_prepare(){
+	mycmakeargs=(
+		$(cmake-utils_use indicate QTINDICATE_ENABLE)
+	)
+
+	kde4-base_src_prepare
+}
diff --git a/net-im/choqok/files/choqok-0.9.55_qt47.patch b/net-im/choqok/files/choqok-0.9.55_qt47.patch
deleted file mode 100644
index ec4711237a53..000000000000
--- a/net-im/choqok/files/choqok-0.9.55_qt47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: choqok-0.9.55/helperlibs/twitterapihelper/twitterapimicroblog.h
-===================================================================
---- choqok-0.9.55.orig/helperlibs/twitterapihelper/twitterapimicroblog.h
-+++ choqok-0.9.55/helperlibs/twitterapihelper/twitterapimicroblog.h
-@@ -170,7 +170,7 @@ protected:
-      timelineName should be a valid, previously created timeline.
-     */
-     virtual void requestTimeLine(Choqok::Account *theAccount, QString timelineName,
--                                 QString sincePostId, int page = 1, QString maxId = 0 );
-+                                 QString sincePostId, int page = 1, QString maxId = QString() );
- 
-     virtual void setTimelineInfos();
-     virtual KUrl apiUrl( TwitterApiAccount* theAccount );
diff --git a/net-im/choqok/files/choqok-0.9.98-libindicate.patch b/net-im/choqok/files/choqok-0.9.98-libindicate.patch
new file mode 100644
index 000000000000..ef7ae8d4b47d
--- /dev/null
+++ b/net-im/choqok/files/choqok-0.9.98-libindicate.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2612167..67dda82 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,18 +8,19 @@ set(CHOQOK_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ 
+ set(CMAKE_MODULE_PATH ${CHOQOK_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+ 
++option(QTINDICATE_ENABLE "Enable support for notifications via indicator")
++
+ find_package(QJson REQUIRED)
+ find_package(QCA2 REQUIRED)
+ find_package(QtOAuth REQUIRED)
+ 
+-find_package(QtIndicate QUIET)
+-
+-if(QTINDICATE_FOUND)
++if(QTINDICATE_ENABLE)
++    find_package(QtIndicate QUIET)
+     message(STATUS "Found libindicate-qt: Will support notifications via indicator")
+     set(HAVE_INDICATEQT true)
+-else(QTINDICATE_FOUND)
++else(QTINDICATE_ENABLE)
+     message(STATUS "Optional dependency libindicate-qt not found: Won't support notifications via indicator")
+-endif(QTINDICATE_FOUND)
++endif(QTINDICATE_ENABLE)
+ 
+ set(CHOQOK_INCLUDES
+ ${KDE4_INCLUDES}
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index a23f444b67d6..48baac85ac92 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name='indicate'>Support for <pkg>dev-libs/libindicate-qt</pkg> notifications</flag>
+	</use>
 </pkgmetadata>