Version bump; remove old

(Portage version: 2.1.10.32/cvs/Linux x86_64)

4 files changed, 10 insertions, 44 deletions

diff --git a/net-libs/libkvkontakte/ChangeLog b/net-libs/libkvkontakte/ChangeLog
index 010f57b879a6..7ac7785cadaa 100644
--- a/net-libs/libkvkontakte/ChangeLog
+++ b/net-libs/libkvkontakte/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libkvkontakte
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/ChangeLog,v 1.2 2011/10/03 18:04:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/ChangeLog,v 1.3 2011/11/09 02:49:24 dilfridge Exp $
+
+*libkvkontakte-2.3.0 (09 Nov 2011)
+
+  09 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -libkvkontakte-2.1.0.ebuild, -files/libkvkontakte-2.1.0-definstall.patch,
+  -files/libkvkontakte-2.1.0-libsuffix.patch, +libkvkontakte-2.3.0.ebuild:
+  Version bump; remove old
 
 *libkvkontakte-2.2.0 (03 Oct 2011)
 
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch
deleted file mode 100644
index 6c48a5f0ea8a..000000000000
--- a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt
---- digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
-+++ digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-09 21:08:31.052194279 +0200
-@@ -65,9 +65,7 @@
- 
- install(TARGETS kvkontakte
- 	EXPORT LibKVkontakteExport
--	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
--	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
--	RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
-+	${INSTALL_TARGETS_DEFAULT_ARGS} )
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/version.h
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch
deleted file mode 100644
index 90a2f8cb89b8..000000000000
--- a/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt
---- digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
-+++ digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt	2011-09-09 21:19:34.114194182 +0200
-@@ -11,11 +11,6 @@
- # TODO: calculate the version id properly (here is currently a hack that won't work for 1.10.0):
- set(LIBKVKONTAKTE_VERSION_ID "0x0${LIBKVKONTAKTE_VERSION_MAJOR}0${LIBKVKONTAKTE_VERSION_MINOR}0${LIBKVKONTAKTE_VERSION_PATCH}")
- 
--# set up install directories. INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR must not be absolute paths
--set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
--set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
--set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
--
- # Use a versioned install directory for the headers so multiple versions can be installed in parallel
- set(INCLUDE_INSTALL_DIR include )
- 
-@@ -29,6 +24,8 @@
- include(KDE4Defaults)
- include(MacroLibrary)
- 
-+set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
-+
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- 
- set(QJSON_VERSION_REQUIRED 0.7)
diff --git a/net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild b/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild
index 73f7345b10bc..1d7e509f74b6 100644
--- a/net-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild
+++ b/net-libs/libkvkontakte/libkvkontakte-2.3.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-libs/libkvkontakte/libkvkontakte-2.1.0.ebuild,v 1.1 2011/09/09 19:22:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkvkontakte/libkvkontakte-2.3.0.ebuild,v 1.1 2011/11/09 02:49:24 dilfridge Exp $
 
 EAPI=4
 
@@ -29,10 +29,7 @@ RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
-PATCHES=(
-	"${FILESDIR}/${P}-libsuffix.patch"
-	"${FILESDIR}/${P}-definstall.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-libdir.patch" )
 
 src_configure() {
 	mycmakeargs=(