5 files changed, 26 insertions, 62 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/Manifest b/net-libs/libkvkontakte/Manifest
index 78024b197f34..f154e9c2bc3e 100644
--- a/net-libs/libkvkontakte/Manifest
+++ b/net-libs/libkvkontakte/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX libkvkontakte-2.1.0-definstall.patch 650 RMD160 7bad766cd0e3f067cbde1449ca2f102479f7226d SHA1 8139824296fb3c1b6775d506a521e5fc16f873bc SHA256 fb0df342a92b3a54ac9929d7f909094927f5f1ba22695a7440283cd77628aa36
-AUX libkvkontakte-2.1.0-libsuffix.patch 1241 RMD160 3374caaccf2121f00d6f471bbffcaba9d9950d5a SHA1 9845b2e0b5cc834711894f446c54b43f3ad26eb1 SHA256 21af22d248ed6f506f916ec8d582cc542f2a6891e694cf3ac7878712934bac2a
 AUX libkvkontakte-2.2.0-libdir.patch 1091 RMD160 efaf4ff47628efce28489676da40ce65bd69c958 SHA1 bbc57b0f314a0a06f4d1b9a7fe522fc5389107ae SHA256 4b20281da5642c65143e193892123723e9125363be090e5a0819d562eec3fada
-DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
 DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616
-EBUILD libkvkontakte-2.1.0.ebuild 865 RMD160 d19359b71f23ec3238cd5b014ca9aec5d8deb237 SHA1 217bfc49d0899780da09665f5356a1f8c5b2b376 SHA256 4020e9d7b2fef9b3529466c14cb83f323e5e5ef0e7cfcf38c49c9219dca828b3
+DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
 EBUILD libkvkontakte-2.2.0.ebuild 824 RMD160 7aa84ed7e5677eb91f82c97a33f116f9ccf18b36 SHA1 46d1680ee46cb331a8fa19362d85d695804037c6 SHA256 69679c7559f35502e428244dbc96713e1ec5ca915b9b3da9d9955a8d4f35ee5a
-MISC ChangeLog 688 RMD160 5d15703ebb4452297a56e823636809f1c47fad70 SHA1 bf932981f11ded1e49c351b44c3246b3a0f20a0a SHA256 d51c2bc00fc7415ff612d569ec676099e3b720a849bdf8ccc7b192414d639b9d
+EBUILD libkvkontakte-2.3.0.ebuild 831 RMD160 9721e5022f6075392eaa2aa49712627fefb84d8d SHA1 0df43550b3b3a8fda247f28927cadedad29bcab9 SHA256 c9b44b19525bf09e4d7cd1246fa8d0b53875fd9e2aa9adaf0a770da4e679eadd
+MISC ChangeLog 960 RMD160 5fe9df2d5ddc30e537085ea6d4910f593a4852af SHA1 cce44b335aa0058388107652857016ad846913f9 SHA256 4ff1450edb5e3acd073ff4edda6167318096826a037f2013a18fd33953eab1bb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOifkcAAoJENwGBM22xffekRwP/1bBXB44syyM0iask2l20v23
-g0TQ8k6BAN3Gh3FZtZuajAR7ixJBIubFqRV9ZJJN3mQrmXYlpIN6qbIogVzLzJ9y
-t/VTnwJWWZM/NS6FHmYufVeDkuX1sSFpCSgL8yVOM6HRYD28giipvx/teAUJI5H1
-GNZ4p4gy9kDk2jtw5U1Y0wYRmlAch/kcrrZhL3cDQ4n/Isk/lgRi831gNJDQMI6W
-EcNwNL/ef80JT4lpnvbdA3f8ITDIRmSeMRgxstUAY5Of97u4Ehpf5q6bu/GnQTHp
-M94+4JmJKH6YtYepu7+yIQihYb4VoYTWdBK4L0NAydWpYyaBptAg4WKXY6BaF2Sf
-SfUOPh6LjPcI3c83G2F8C6uV2jO+XytWjw9COMVTgygjuZ1JXQhwpUUk2u16nqAW
-pvO4UO7ocsCTD1qfI4obi9kR7mqV8ZST+k+u4olZ/bf5jc82ac1Kj1cmjK4cCF0I
-iR0Ow+KdCq7TAXzD+mc63pOub6DPfZpzPgnYddJ+IlpEeg8wzYC5iQSsosMMoGod
-oDSO+OolkB87D5uMIkTNGZzLrdUiEV3o3Z2gy0HPAOnK6x2sCHpvVIkDcqvnb9Di
-Ge7sg/Frrjq6rlv0scumXOrUEeCK8klV6QgY4XoTThycMsTTl+55y6u7sGG27CC5
-VZM33Hkk1BMsczW+ePdL
-=K8xI
+iQIcBAEBCgAGBQJOuepEAAoJENwGBM22xffe87sP/jkL5PPr/r7bUtTuZCCdEkQz
+HSloZtwjwx2dH3uZyqUSDKyPnP5M/g7r6Cq9OoHBNuSj4KUUwsf3c77TC4lbR6hY
+n/n0u/TEhU/PlQQujg6N5xwlYYptGNpXu7L4BN3Uk9F22pb3CSzHFyv/+4eMRj3v
+zCSS+gYZZYfF7j7MMR1IPvvOluMnHB5bE/SVrYpxoRV7hCPfcXsxIGjWJHHYlzKF
+VsWURGg7nrPtpuES2f4qlALKWdQg5MfUVJ3bMA/hcxASatambtmLujMPX9y45sRP
+cXDODczgQ/3OT2LgTdRbkNXzKG5XOsreAbw4UESGER7t5D3TMJNq0p87pWvp+hvn
+MQSDoC1uUORgMNEfowr5z3F4YFYm+aLpA/k8+y/VOIXBr7UnDvNSAR7m6+tEV3YD
+2ybJz79wKLCH+A1vcBCZDtKxkAQHP8bIiZIQki9P+gToARIV6qSpYxBZhcKHgkV+
+deTgFJV70Ud+Qxs0GtYIt9gNUpz2eKZW+O0B9dzt0CvaHTbwDd99f/h/iI+hoM5V
+e9QT/mw+PInzSycW1L7dMeSBRhCzMBMYGnfc89ywNOcvF1SCIR8AMQtbfhAqJUIh
+iKwAHPCr2BBw3OS055v0xMaCsBZAbgN3n9fMwYNtxPcPYeP+XYKQAmqsxTMUwMI1
+t1Mn/F2XXXWtB3+5timH
+=Yutf
 -----END PGP SIGNATURE-----
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=(