Version bump, bug 352990 and bug 348456

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 14 insertions, 39 deletions

diff --git a/net-im/choqok/ChangeLog b/net-im/choqok/ChangeLog
index 239b1a9a0b7d..580fe246de15 100644
--- a/net-im/choqok/ChangeLog
+++ b/net-im/choqok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/choqok
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.16 2011/01/28 06:56:59 tampakrap Exp $
+
+*choqok-1.0 (28 Jan 2011)
+
+  28 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -choqok-0.9.98-r1.ebuild, -files/choqok-0.9.98-libindicate.patch,
+  +choqok-1.0.ebuild:
+  Version bump, bug 352990 and bug 348456
 
 *choqok-0.9.98-r1 (13 Jan 2011)
 
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 073460f178c3..c29f27af8d3a 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,7 +1,6 @@
-AUX choqok-0.9.98-libindicate.patch 925 RMD160 6db8e4ac6894c41d45f874bbd85edbba782cbf30 SHA1 b4f40344e32ea0add348aff2173dd2085ab64320 SHA256 42f2ae93b6000fc0b440b54bc99c4e45a73bf06d6dbf74a44d3c04c4ffae99d3
+DIST choqok-1.0.tar.bz2 885498 RMD160 8f232d1d8ba96bee46f5ebd0289a95154267e0d2 SHA1 f50345142525a182dc081b23617551ed6c44fea2 SHA256 45d08a621f2e96fb235aba24c181970cb9ddd423a695cd6c4f9be55300764847
 DIST choqok.0.9.90.tar.bz2 440689 RMD160 00b00edf37294d05a8ea885779cfbda6b7825741 SHA1 6802a6b29405105c3879a7b05bd2a9173503f1df SHA256 f8bca5729769003533cb0da7438773824fb02b0dd6460ae4c908ca81174244bb
-DIST choqok_0.9.98.tar.bz2 727873 RMD160 df28d7152e4fef7966621fbacd8c4a10487f1cab SHA1 204dd8147c89003f3bbeca0bdd18fc4137170ebf SHA256 3edb9a1394e754e3a72d7032d94ec738752cc35ca4c0558f1472e5a0677d09f2
 EBUILD choqok-0.9.90-r1.ebuild 762 RMD160 3caa8a173200bc497df2ecdf3571349a991c93cb SHA1 bd4d3083bd5746170235cdcb7e2f1c98b6c32b21 SHA256 88ddd900b27586621e1a9c4984d712b83ce2809e883c0f5bd06a461339a46d54
-EBUILD choqok-0.9.98-r1.ebuild 917 RMD160 c5aaeb9fa0984476aa50c9712a6dc465e644dbdc SHA1 0fb267fb356ebebee24074b94ae867285d4a74d2 SHA256 3a10727461fdc475bf81b99c20c2080f7a99cf50040a8c6239b16671ad3ed8fd
-MISC ChangeLog 2679 RMD160 94d178c2eab42b844993cc31fcf9f76315ed3f9c SHA1 e139c57b8f9e460259e562ddbd632737f00c18d5 SHA256 f04f0100e8fa1a12a210af0ddca46d86ca6864162d51939a0fd4daf8369bc803
+EBUILD choqok-1.0.ebuild 856 RMD160 1efb80f9b5de07fc7128e8d68c672ca8e97804c0 SHA1 85c539cb1f059a31c2df8483ebfe5ec565874984 SHA256 95d7f8514dbbd30c4f13a6d81defb9dd00775fb8230b1b6b72f5e770728c4018
+MISC ChangeLog 2895 RMD160 670c5fb627389d0c52e5c83a2400a9e3c8820eb9 SHA1 2b9572bfa54e164e01cb52e58fb01dbe8d412293 SHA256 6d1b63c5d078c6d2393eabed30733a49008c85b5e955dc6442344d9f927e3ba6
 MISC metadata.xml 264 RMD160 6635854d3ceb1ba29288435f98f2d3528e8abfee SHA1 b134d85ce6edba19983d2f97c8beaad07629ed65 SHA256 e5eb6745453aa53ed155e7f49eb761f4670847982d1c14f597d92b7870aba4a6
diff --git a/net-im/choqok/choqok-0.9.98-r1.ebuild b/net-im/choqok/choqok-1.0.ebuild
index 0deea5cb11f7..b9ccc0c1667f 100644
--- a/net-im/choqok/choqok-0.9.98-r1.ebuild
+++ b/net-im/choqok/choqok-1.0.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/01/13 06:59:29 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-1.0.ebuild,v 1.1 2011/01/28 06:56:59 tampakrap Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ KMNAME="extragear/network"
 
 if [[ ${PV} != *9999* ]]; then
 	KDE_LINGUAS="bg da de en_GB es et fr ja nb nds nl pa pl pt pt_BR sv tr uk zh_CN zh_TW"
-	SRC_URI="http://choqok.gnufolks.org/pkgs/${PN}_${PV}.tar.bz2"
+	SRC_URI="http://choqok.gnufolks.org/pkgs/${P}.tar.bz2"
 fi
 
 inherit kde4-base
@@ -27,11 +27,9 @@ DEPEND="dev-libs/qjson
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-libindicate.patch" )
-
 src_prepare(){
 	mycmakeargs=(
-		$(cmake-utils_use indicate QTINDICATE_ENABLE)
+		$(cmake-utils_use !indicate QTINDICATE_DISABLE)
 	)
 
 	kde4-base_src_prepare
diff --git a/net-im/choqok/files/choqok-0.9.98-libindicate.patch b/net-im/choqok/files/choqok-0.9.98-libindicate.patch
deleted file mode 100644
index ef7ae8d4b47d..000000000000
--- a/net-im/choqok/files/choqok-0.9.98-libindicate.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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}