Version bump. Cleanup old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 12 insertions, 53 deletions

diff --git a/net-libs/libnm-qt/ChangeLog b/net-libs/libnm-qt/ChangeLog
index 93d13dde19aa..ee6ced865e83 100644
--- a/net-libs/libnm-qt/ChangeLog
+++ b/net-libs/libnm-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libnm-qt
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.3 2013/11/21 22:43:57 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/ChangeLog,v 1.4 2014/02/16 15:23:14 mrueg Exp $
+
+*libnm-qt-0.9.8.1 (16 Feb 2014)
+
+  16 Feb 2014; Manuel Rüger <mrueg@gentoo.org> +libnm-qt-0.9.8.1.ebuild,
+  -files/libnm-qt-0.9.0.1-libmm-optional.patch,
+  -files/libnm-qt-0.9.0.1-tests-optional.patch, -libnm-qt-0.9.0.1.ebuild:
+  Version bump. Cleanup old.
 
 *libnm-qt-0.9.8.0 (21 Nov 2013)
 
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch
deleted file mode 100644
index 3ce02c0c91a7..000000000000
--- a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-libmm-optional.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 607b9338a40cdde705f91c5cd95d715e5514f4cb
-Author: Jan Grulich <jgrulich@redhat.com>
-Date:   Fri Oct 11 16:56:49 2013 +0200
-
-    Fix build without libmm-qt
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6b0fcb..b660b38 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,7 +218,12 @@ qt4_automoc(${DBUS_INTERFACE_SRCS})
- 
- add_library(NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS} ${DBUS_INTERFACE_SRCS} ${CONNECTIONS_SETTINGS_SRCS} ${NetworkManagerQt_MOC} )
- 
-+if (MODEMMANAGERQT_FOUND)
- target_link_libraries(NetworkManagerQt ModemManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
-+else()
-+target_link_libraries(NetworkManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
-+endif()
-+
- install(TARGETS NetworkManagerQt DESTINATION lib${LIB_SUFFIX})
- 
- install( FILES
diff --git a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch b/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
deleted file mode 100644
index 581680808aae..000000000000
--- a/net-libs/libnm-qt/files/libnm-qt-0.9.0.1-tests-optional.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f76283..cc05451 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,8 +50,13 @@ if (BUILD_EXAMPLES)
-     add_subdirectory(examples)
- endif(BUILD_EXAMPLES)
- 
--enable_testing(true)
--add_subdirectory(tests)
-+option(DISABLE_TESTING "Disable unit tests" FALSE)
-+if (DISABLE_TESTING)
-+    message(STATUS "Disabling unit tests")
-+else()
-+    enable_testing(true)
-+    add_subdirectory(tests)
-+endif()
- 
- set(NetworkManagerQt_HEADERS
-     accesspoint.h
diff --git a/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild b/net-libs/libnm-qt/libnm-qt-0.9.8.1.ebuild
index 7ce77ae8ef3e..258c2a84c0f3 100644
--- a/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild
+++ b/net-libs/libnm-qt/libnm-qt-0.9.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.0.1.ebuild,v 1.2 2013/10/16 18:38:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnm-qt/libnm-qt-0.9.8.1.ebuild,v 1.1 2014/02/16 15:23:14 mrueg Exp $
 
 EAPI=5
 
@@ -26,17 +26,12 @@ RDEPEND="
 	dev-qt/qtdbus:4
 	net-misc/mobile-broadband-provider-info
 	>=net-misc/networkmanager-0.9.8.0
-	modemmanager? ( net-libs/libmm-qt )
+	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-libmm-optional.patch"
-	"${FILESDIR}/${P}-tests-optional.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF