Remove old.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 15 insertions, 142 deletions

diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index 7ed95801b51b..c06142f5e576 100644
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/tellico
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.110 2012/04/18 21:52:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.111 2012/04/18 22:09:49 johu Exp $
+
+  18 Apr 2012; Johannes Huber <johu@gentoo.org>
+  -files/tellico-2.3.4-kdepimlibs.patch, -tellico-2.3.4.ebuild:
+  Remove old.
 
   18 Apr 2012; Markus Meier <maekke@gentoo.org> tellico-2.3.5.ebuild:
   x86 stable, bug #409403
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 713e4c237e42..251136ddb189 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX tellico-2.3.4-kdepimlibs.patch 2349 RMD160 e1551a103df587bb0991e1422b2d4002d6d52d48 SHA1 1a706626d14eb0acd3027794f0e9c0d0925d8bcc SHA256 4d3486cfe04ed6e9a2d1fc8341081877b23eae02d6c6e679f901bbe95aeecc40
-DIST tellico-2.3.4.tar.bz2 2910721 RMD160 b33578911b77eee9205007852ee2964afe4ada92 SHA1 7e753d99d701d01aea6c89eb8405150daa8ddcfc SHA256 376d8e8db8fcf19f77300e10921991d67d3d99e1abb88eda97900932c6e486fd
 DIST tellico-2.3.5.tar.bz2 4402734 RMD160 83ab99ca415c8e5a9caed1cf7f684ff5fc76b8f5 SHA1 336f34e378a711d951bdbb7784a04a6451a5c314 SHA256 b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c
-EBUILD tellico-2.3.4.ebuild 1776 RMD160 9cb616636ee969687db4ed165f7ac3f4e9ccc035 SHA1 a400fc8296dcd363463350137e11a3f5310f0c03 SHA256 f202506a106ed73ab6d6cba40a972e7efc28f7be83dd6a09c6b6fdb4ef379565
 EBUILD tellico-2.3.5.ebuild 1730 RMD160 4be522fe11738570faea41af17f71b1d372a73f6 SHA1 b184e16c8ff727808cf643b0ad3425d5a171fd01 SHA256 f397da06463ac29c9192393b747f44643d95e13c8d09e2d18e51d4f61eec8e80
-MISC ChangeLog 13925 RMD160 460713c3cefb4bbb2ff1208cb8e8b6f322a8780f SHA1 63824887d373dddae5968cfe94389bde938b12cb SHA256 bb728402de7daa7e2c1f43fb9d99e28d7b33d9c6e285d954d7269856e85974ec
+MISC ChangeLog 14050 RMD160 6dfc30c9840016862a1a51629ccfa33ba16042a9 SHA1 f2558ce1fa57fc85f2a890f1a3c8060267bb5470 SHA256 91ae806aebe93dfa675ba0db2de39fc39c30e4db4f94e7f7db5df412d8ea2f7c
 MISC metadata.xml 497 RMD160 e3a18c1a432a4809f8d888d9199d54fc12715934 SHA1 b036fc7e7c2e9cfd1dd9171abd7d1bf0b1a97e28 SHA256 d97e6f40107c07f33255592d4105a346b321fca57155db4c6b9301af659b7ffc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+POEMACgkQkKaRLQcq0GLfxgCgss74GPNAEmdOEOaY7IHriLBj
-rkcAnjxXaZ6XDO5CPO50vFw1FqnrHDmI
-=HLCt
+iQEcBAEBCgAGBQJPjzvXAAoJEO+t9ga+3I3aLD4H/3mjko/RHXxXahPqeTFlIqXF
+dqZAoN1mID7nnGGCTpBQ2xzzJIh0ujMQm+u+TgiV7ROljuQx0ogNoWiHwud5bkMM
+I5OcsfkcesK9DBd5TvUPS5gGjqb05dsuMfHBe1wBPhvz53Ne/zhoUvQG0RAzYL7e
+UQM7NHh734YFKlaIYS0YdLmrbAyUJd+le7ut6+Mpy7tCjBfnvyOIk7xBj9MfJtJ0
+2Q+SlSPMqCQl9tcK+Bao96xVnchq5laBDoKcVM3eGBzse56+62SNB6DC1klnRNuI
+qX46IU+P7rSDGQRRm3x42OFIFF/gXgMo9dM4EmDxMLBGE94NdOLJSJEZARzLFl0=
+=W3hD
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch b/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch
deleted file mode 100644
index 226c4d93a586..000000000000
--- a/kde-misc/tellico/files/tellico-2.3.4-kdepimlibs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Robby Stephenson <robby@periapsis.org>
-Date: Wed, 28 Sep 2011 02:27:06 +0000
-Subject: Use defined preprocessor command
-X-Git-Url: http://quickgit.kde.org/?p=tellico.git&amp;a=commitdiff&amp;h=f5e0ff01a8e4285ce018efd1c4c10528d33bc442
----
-Use defined preprocessor command
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,6 +161,7 @@ macro_bool_to_01(KSANE_FOUND HAVE_KSANE)
- macro_bool_to_01(KDEMULTIMEDIA_FOUND HAVE_KCDDB)
- macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KABC)
- macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KCAL)
-+macro_bool_to_01(KDEPIMLIBS_FOUND HAVE_KXMLRPC)
- macro_bool_to_01(LIBV4L_FOUND HAVE_V4L)
- macro_bool_to_01(QJSON_FOUND HAVE_QJSON)
- macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
-
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -24,6 +24,8 @@
- 
- #cmakedefine HAVE_KCAL
- 
-+#cmakedefine HAVE_KXMLRPC
-+
- #cmakedefine HAVE_KCDDB
- 
- #cmakedefine ENABLE_AMAZON
-
---- a/src/fetch/CMakeLists.txt
-+++ b/src/fetch/CMakeLists.txt
-@@ -57,12 +57,12 @@ TARGET_LINK_LIBRARIES(fetch
- 
- # Versions of KDE prior to 4.7 have a character encoding bug in libkxmlrpc
- # Use internal version of libkxmlrpc if so
--IF (${KDE_VERSION} VERSION_GREATER "4.6.99")
-+IF (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99")
-   TARGET_LINK_LIBRARIES(fetch ${KDEPIMLIBS_KXMLRPCCLIENT_LIBS})
--ELSE (${KDE_VERSION} VERSION_GREATER "4.6.99")
-+ELSE (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99")
-   ADD_SUBDIRECTORY(xmlrpc)
-   TARGET_LINK_LIBRARIES(fetch xmlrpc)
--ENDIF (${KDE_VERSION} VERSION_GREATER "4.6.99")
-+ENDIF (KDEPIMLIBS_FOUND AND ${KDE_VERSION} VERSION_GREATER "4.6.99")
- 
- IF( YAZ_FOUND )
-   TARGET_LINK_LIBRARIES(fetch ${YAZ_LIBRARIES})
-
---- a/src/fetch/moviemeterfetcher.cpp
-+++ b/src/fetch/moviemeterfetcher.cpp
-@@ -22,6 +22,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include "config.h"
- #include "moviemeterfetcher.h"
- #include "../collections/videocollection.h"
- #include "../images/imagefactory.h"
-@@ -43,7 +44,7 @@
- // since it doesn't handle character encoding correctly
- // see https://git.reviewboard.kde.org/r/101838/
- #include <kdeversion.h>
--#if KDE_IS_VERSION(4,7,0)
-+#if defined(HAVE_KXMLRPC) && KDE_IS_VERSION(4,7,0)
- #include <kxmlrpcclient/client.h>
- #else
- #include "xmlrpc/client.h"
-
diff --git a/kde-misc/tellico/tellico-2.3.4.ebuild b/kde-misc/tellico/tellico-2.3.4.ebuild
deleted file mode 100644
index f17d3e434c06..000000000000
--- a/kde-misc/tellico/tellico-2.3.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-2.3.4.ebuild,v 1.6 2012/03/15 18:38:48 ssuominen Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl hu ia it ja lt ms nb nds nl nn
-pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="A collection manager for the KDE environment"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="addressbook cddb debug +handbook pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/qjson
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	media-libs/qimageblitz
-	x11-libs/qt-dbus:4
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	cddb? ( $(add_kdebase_dep libkcddb) )
-	pdf? ( >=app-text/poppler-0.12.3-r3[qt4] )
-	scanner? ( $(add_kdebase_dep libksane) )
-	semantic-desktop? ( dev-libs/soprano[raptor,redland] )
-	taglib? ( >=media-libs/taglib-1.5 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xmp? ( >=media-libs/exempi-2 )
-	yaz? ( >=dev-libs/yaz-2 )
-"
-RDEPEND="${DEPEND}"
-
-# tests need network access and well-defined server responses
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.4-kdepimlibs.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable v4l WEBCAM)
-		$(cmake-utils_use_with xmp Exempi)
-		$(cmake-utils_use_with scanner KSane)
-		$(cmake-utils_use_with cddb Kcddb)
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with taglib)
-		$(cmake-utils_use_with yaz)
-	)
-
-	kde4-base_src_configure
-}