net-misc/netvirt: update live ebuild

Signed-off-by: Dominik Kriegner <dominik.kriegner@gmail.com>

5 files changed, 10 insertions, 88 deletions

diff --git a/net-misc/netvirt/Manifest b/net-misc/netvirt/Manifest
index 0b8d39c..5c43911 100644
--- a/net-misc/netvirt/Manifest
+++ b/net-misc/netvirt/Manifest
@@ -1,5 +1,4 @@
-AUX netvirt-agent.rc 303 BLAKE2B e4888abd6c2015434ab2721eab7ef69ef60640335c01dd752774cef8c4ba274e7197d6586b495cee3aa43d637361b8fbd73ab4ce0ac4ba9b852dc32844b204b5 SHA512 e8f852619090b077f883e92a7690504cf264b8c68f236f699ac831ab6582e390f3a78a1e4c2d5fee925bc3d76d0bf3cebbbdfc2e6c2f186abe559dd9b5b97ad0
-AUX netvirt-agent.service 228 BLAKE2B 76bdd239315cfd3f7e3bcaef31e672569be4236b699e767a4b6c5f97062c0b9e1990c26a4386492ffdb7c3a0564b15ea6923cb8ac6e6c29933ce718e22a2df7e SHA512 9854852a6ff962f0e13fc4fc429f8c1cefd97000b58dacb63dead441f30b2941bb2988556b1d86b263e2921136364fd23d6c7f6e93b47a253d299b802b865921
-AUX netvirt-system-libconfig.patch 2169 BLAKE2B 02a1ea74f8b3465459bbdfc627141e5847c7172f4fbb4e21456083570d9d2ce9b173419d422ae1849ea63e4f2d80ec7dacfcec30a1fad0af045990c94d4d046f SHA512 dfd91cd81f9815a3f26fdbda483c82ab2e3a06ccbec1a054fcbec3d2579b644335b41a39f1c8ba1ae47d5990d5b4114180fe8fd47a8fc064d16a1f7f46981ebf
-EBUILD netvirt-9999.ebuild 1028 BLAKE2B 637b5dbfcf95545f84ab050febffbcc2cbc1cebeba5533dec3fd1b1cd60187fc89c9028185538599432bacb375938bef9f5891c00862e071ee5dece8fd7745a8 SHA512 bef88cff4302be67400b2602423f2c0f435fa08a030b9a53d708ef39170d44ff5fa06217c41953eeaeb22236c94080a74ef8a501f07fc09539767f298458bf2c
+AUX netvirt-agent.rc 304 BLAKE2B 6c2bbf0d8e2afb4e30f0357ec96b900699faec1f92753035c280956a8acfb7a746d73c95e99c06f555f126195a26f498209559c652fbfffe129569c2f604619b SHA512 ce5cdf5a131084467213664296c8a397f1cddbc38cf424bfa52e95f77dd9432585ec2bdb3e050f4fba904ec5dd0d8c1e4c08748fe44608796e604f7ce1f9049a
+AUX netvirt-agent.service 229 BLAKE2B 540ffa0372a4e94f312293df60a8bc7bae1107ad41754c3d7ea1357c3c0f0b592ceeb25db19542b5192f5374d0207c1ff7b1f389d163192c5c20d0cad264e3ca SHA512 49ab9785671302a12a7af20f04f9c1590475ee986ef69d1f8c8068f0f61bf7ac90d480aa5a30a7c73073b23c2751672d95b34d6ad8b0c14d19c8a39161b65bd3
+EBUILD netvirt-9999.ebuild 891 BLAKE2B 2bcba9130661eaf96883c4faa08b6dacb30084c667d32c23872b2263cd960f92b3ab3308bf2e3d91984f6d80a762039dc72f51e718595ecff4deed45d2b7682d SHA512 cfec106b07144e60267eb1380fc1e087246ca2092ffc88443f2798b9ddf4cb2411a06a41664be3947602a0abe7fa9e3e1a609c544632e44c9c35e1de743f48f2
 MISC metadata.xml 602 BLAKE2B 573998e1a077bbc6111964fa5d47c912ed2a5e18c0e2c4aa625f7eff30d8c4468bd5a55ee10b327df199e1e6831c056c604a5e398bc4b69e06728f34daf6ffdb SHA512 89c067677fd4ecfba9ac524cf58737f306898171f6a33f4416bfd807f32a30539298b42fcd75e7f24304fa7088b1c966e98a6495229ada3958589c060c93c179
diff --git a/net-misc/netvirt/files/netvirt-agent.rc b/net-misc/netvirt/files/netvirt-agent.rc
index 1ebb114..d5803eb 100644
--- a/net-misc/netvirt/files/netvirt-agent.rc
+++ b/net-misc/netvirt/files/netvirt-agent.rc
@@ -5,7 +5,7 @@
 
 description="start a daemon to maintain a DynVPN connection"
 
-command="netvirt-agent"
+command="netvirt-agent2"
 command_background="true"
 pidfile="/var/run/${SVCNAME}.pid"
 
diff --git a/net-misc/netvirt/files/netvirt-agent.service b/net-misc/netvirt/files/netvirt-agent.service
index f892d29..57887cd 100644
--- a/net-misc/netvirt/files/netvirt-agent.service
+++ b/net-misc/netvirt/files/netvirt-agent.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Environment="HOME=/root"
-ExecStart=/usr/bin/netvirt-agent
+ExecStart=/usr/bin/netvirt-agent2
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/net-misc/netvirt/files/netvirt-system-libconfig.patch b/net-misc/netvirt/files/netvirt-system-libconfig.patch
deleted file mode 100644
index c75c865..0000000
--- a/net-misc/netvirt/files/netvirt-system-libconfig.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Dominik Kriegner <dominik.kriegner@gmail.com>
-Date: Tue, 30 Nov 2016 20:30:00 +0000
-Subject: [PATCH] use systems libconfig libary
-
-diff -urN a/nvagent/src/CMakeLists.txt b/nvagent/src/CMakeLists.txt
---- a/nvagent/src/CMakeLists.txt	2016-11-30 19:11:24.949262776 +0100
-+++ b/nvagent/src/CMakeLists.txt	2016-11-30 20:20:17.627577305 +0100
-@@ -20,7 +20,6 @@
- 
- message(STATUS "CMAKE_SOURCE_DIR" ${CMAKE_SOURCE_DIR})
- 
--link_directories("${CMAKE_SOURCE_DIR}/libconfig/lib/.libs")
- link_directories("${CMAKE_SOURCE_DIR}/tapcfg/build")
- 
- if (WITH_GUI)
-@@ -103,12 +102,12 @@
- 	target_link_libraries(netvirt-agent
- 		-Wl,-Bstatic
- 		tapcfg
--		config
- 		nvcore
- 		-Wl,-Bdynamic
- 		ssl
- 		crypto
- 		pthread
-+		config
- 	)
- endif()
- 
-diff -urN a/nvctrler/src/CMakeLists.txt b/nvctrler/src/CMakeLists.txt
---- a/nvctrler/src/CMakeLists.txt	2016-11-30 19:11:24.951262484 +0100
-+++ b/nvctrler/src/CMakeLists.txt	2016-11-30 20:21:53.859030787 +0100
-@@ -21,9 +21,7 @@
- find_library(EVENT_SSL_LIBRARY event_openssl HINTS /usr/local/lib)
- 
- include_directories("/usr/local/include")
--include_directories("${CMAKE_SOURCE_DIR}/libconfig/lib/")
- include_directories("${CMAKE_SOURCE_DIR}/libnvcore/src/protocol/")
--link_directories("${CMAKE_SOURCE_DIR}/libconfig/lib/.libs")
- target_link_libraries(netvirt-ctrler
- 	nvcore
- 	${EVENT_CORE_LIBRARY}
-@@ -34,7 +32,7 @@
- 	crypto
- 	jansson
- 	pthread
--	${CMAKE_SOURCE_DIR}/libconfig/lib/.libs/libconfig.a
-+	config
- )
- 
- install(TARGETS netvirt-ctrler
-diff -urN a/nvswitch/src/CMakeLists.txt b/nvswitch/src/CMakeLists.txt
---- a/nvswitch/src/CMakeLists.txt	2016-11-30 19:11:24.952262338 +0100
-+++ b/nvswitch/src/CMakeLists.txt	2016-11-30 20:21:30.212612668 +0100
-@@ -22,7 +22,6 @@
- include_directories("${CMAKE_SOURCE_DIR}/libconfig/lib/")
- include_directories("${CMAKE_SOURCE_DIR}/libnvcore/src/")
- include_directories("${CMAKE_SOURCE_DIR}/libnvcore/src/protocol/")
--link_directories("${CMAKE_SOURCE_DIR}/libconfig/lib/.libs")
- target_link_libraries(netvirt-switch
- 	nvcore
- 	${EVENT_CORE_LIBRARY}
-@@ -31,7 +30,7 @@
- 	crypto
- 	pthread
- 	jansson
--	${CMAKE_SOURCE_DIR}/libconfig/lib/.libs/libconfig.a
-+	config
- )
- 
- install(TARGETS netvirt-switch
diff --git a/net-misc/netvirt/netvirt-9999.ebuild b/net-misc/netvirt/netvirt-9999.ebuild
index c83463f..16c5e79 100644
--- a/net-misc/netvirt/netvirt-9999.ebuild
+++ b/net-misc/netvirt/netvirt-9999.ebuild
@@ -16,25 +16,19 @@ KEYWORDS=""
 IUSE="gui"
 
 RDEPEND="sys-libs/libcap
-		 dev-libs/libconfig
-		 gui? ( dev-qt/qtgui:4
-			   dev-qt/qtdeclarative:4 )"
+		dev-libs/libconfig
+		gui? ( dev-qt/qtgui:4
+		dev-qt/qtdeclarative:4 )"
 DEPEND="${RDEPEND}
-	 	dev-util/scons
+		dev-util/scons
 		dev-util/cmake"
 
-PATCHES=( "${FILESDIR}"/netvirt-system-libconfig.patch )
-
 src_configure() {
-	local mycmakeargs=( -DWITH_GUI=$(usex gui)
-					    -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	local mycmakeargs=( -DWITH_GUI=$(usex gui) )
 	cmake-utils_src_configure
 }
 
 src_compile() {
-	cd udt4
-	emake
-	cd ..
 	cd tapcfg
 	scons
 	cd ..