gentoo resync : 22.10.2018

5 files changed, 88 insertions, 74 deletions

diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index 444f153062fa..ba25fca14284 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,5 +1,5 @@
 AUX lemon-1.3-as-needed.patch 1346 BLAKE2B 9c198c0062a47f2da724149a147bd2ab1b798df60ec5a8945249b9d8c09ab94094458ba6df7fc9d17b7e51f57f1268432e2ec3086013b3cd0f174af0ffe1c896 SHA512 20aef0cfc1b6884604a3cf1f4a60feb688ab4d1a958314c242e965195d6cc950062f67f7ef273fc096fe5fcd7a7ee9acb76215c1a6a173587da3b5e76b163468
-AUX lemon-1.3-multilib.patch 437 BLAKE2B aea3b751939620ec8ddc10f586404501b05d5a935d612fd8cb9db2336d728a87cdb0d0c1a9adf541b2e0247cf87b4039ba85bf546cf2fe69377bbbd1081888bc SHA512 6efd7280070bae7bf7e62b28fb6a99e5f2190ddff75f8dd500a629c2a60908670c3ea19aeaf0086059ba9c3c7439e0c835811684dc1c2525c4f8a304a36bba8c
-DIST lemon-1.3.tar.gz 5454290 BLAKE2B f204b84d6ce82d1e942597e40c3b35e0a218d110017bc74d8982d09270e2d94e260e2a62e818e88d69a56a75886a60343b787e2cf05d581b5e520faaf2c73b02 SHA512 f48c14e42e0a463a3d203a05a012fdf635cf09503a5d18e14e64722e9f7f68d7fc223059e0a6a5d118491a473a25196d531e0a6302552f9fb8c121a4ed70af45
-EBUILD lemon-1.3-r2.ebuild 1822 BLAKE2B 84dcdcb8951c75f8ca3898b091b5805af8846f1a474bd22c564c262507c535026dff99e9d2acc30ebd9adb0a9a6dee8a58efe1b96433d476116b1a018280ef9b SHA512 d9fc4a966c4cbfe05f034acc1a3ce8d789aa2b7daeded6bbe95ccc00433ca222e54d78ff9ab6de3b100891058cf3928d7800e27272f80c804c90e99122eb80e8
-MISC metadata.xml 969 BLAKE2B 441103bb2e1358e30c137760af47dd6151f14c54e99ef7dac8cec16f92e4e53150aa38dbd22a18d5bd0f4c794b2a6e78b05c98c9b1a75b6053b5c59ba9d334c3 SHA512 2d83367611c99baa4a589677c752344b4d72ec460456d99ff1cc030f202df32e680b871159532cf5d06472dda596919e8edc23872eb166e25277015c38b9c9e8
+AUX lemon-1.3.1-multilib.patch 841 BLAKE2B 416a2cff88fd4cb1f07a10a9bfe1ca1861c82c70055a30a900bcd622c307b2bd34f87eb1731b6dbe19e1b6e68148cb9d020082cc13ddd24ae375e0db9d0909f6 SHA512 4e31feda5672bcc02bad95d2b794aa2df9d028c655f157f2f95ba0d75679dce68a2cd54e5aa7c6e61f8eec71b7801e57456ca1def3c50d67c17e16a195b9efed
+DIST lemon-1.3.1.tar.gz 5142826 BLAKE2B 23d3b637b4dd32d73bb053b4f5d032e16be787ba162eed6df793f65b81efef6d7ca66d6e5a483b75ac7b1ddb7c8a2698b3b13eb16fcd44e0b726052290082bee SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038
+EBUILD lemon-1.3.1.ebuild 1922 BLAKE2B 1593132815565bc5765507d6834bd6fe233ce6fac41dc01fa77a2e3fa4209c867df336208d8f513670c2b926f2edf6b8e48e7994bdcc013be06d527e2de5537d SHA512 8895c41d7bbed07e57dac8cad33b938c0b859702983a21e92235d768cd27c42fb6a24ce140b4bbed7348def71ded6cfd2a8fa129e9ab5fdbb67031a19a64fefa
+MISC metadata.xml 813 BLAKE2B 1f398a318d3bdf0b2929a992e80f64df34fa71dbb118de41ae369d46b5c1b763bbedf0b623a056e71ecb98befe5b6dbd6fa29fa71ffe3dd2735f2c5911871580 SHA512 a95dba8ed4531ca6563f4a9582933215f7136d13c3ead6d5a0ff5ff765c66d3f085c31908ed547297e28afd6a5ce7d0368f85b8053f8f9ab95da26db667a2afc
diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch
deleted file mode 100644
index ee578d4a0f6a..000000000000
--- a/sci-libs/lemon/files/lemon-1.3-multilib.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- lemon/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
-index 8011833..0209acf 100644
---- a/lemon/CMakeLists.txt
-+++ b/lemon/CMakeLists.txt
-@@ -61,8 +61,8 @@ ENDIF()
- 
- INSTALL(
-   TARGETS lemon
--  ARCHIVE DESTINATION lib
--  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib${LIB_SUFFIX}
-+  LIBRARY DESTINATION lib${LIB_SUFFIX}
-   COMPONENT library
- )
- 
diff --git a/sci-libs/lemon/files/lemon-1.3.1-multilib.patch b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
new file mode 100644
index 000000000000..f2b3cd6bf00c
--- /dev/null
+++ b/sci-libs/lemon/files/lemon-1.3.1-multilib.patch
@@ -0,0 +1,31 @@
+--- a/lemon/CMakeLists.txt	2014-07-07 16:40:24.911315501 +0200
++++ b/lemon/CMakeLists.txt	2018-10-15 22:13:12.040890710 +0200
+@@ -66,8 +66,8 @@
+ 
+ INSTALL(
+   TARGETS lemon
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib${LIB_SUFFIX}
++  LIBRARY DESTINATION lib${LIB_SUFFIX}
+   COMPONENT library
+ )
+ 
+@@ -86,6 +86,6 @@
+ 
+ INSTALL(
+   FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
+-  DESTINATION lib/pkgconfig
++  DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ )
+ 
+--- a/lemon/lemon.pc.in	2014-07-07 16:40:24.949315716 +0200
++++ b/lemon/lemon.pc.in	2018-10-15 22:45:28.869931587 +0200
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
++libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: @PROJECT_NAME@
diff --git a/sci-libs/lemon/lemon-1.3-r2.ebuild b/sci-libs/lemon/lemon-1.3.1.ebuild
index 4ebb5c672099..3a35fa7919de 100644
--- a/sci-libs/lemon/lemon-1.3-r2.ebuild
+++ b/sci-libs/lemon/lemon-1.3.1.ebuild
@@ -1,51 +1,47 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils
 
 DESCRIPTION="C++ template static library of common data structures and algorithms"
 HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/"
-SRC_URI="http://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
+SRC_URI="https://lemon.cs.elte.hu/pub/sources/${P}.tar.gz"
 
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+coin doc glpk static-libs test tools"
+IUSE="+coin doc glpk static-libs test"
+
+REQUIRED_USE="|| ( coin glpk )"
 
 RDEPEND="
+	coin? (
+		sci-libs/coinor-cbc:=
+		sci-libs/coinor-clp:=
+	)
 	glpk? ( sci-mathematics/glpk:= )
-	coin? ( sci-libs/coinor-cbc:= sci-libs/coinor-clp:= )"
+"
 DEPEND="${RDEPEND}
 	doc? (
+		app-doc/doxygen
 		app-text/ghostscript-gpl
 		dev-libs/mathjax
-		app-doc/doxygen )"
-
-REQUIRED_USE="|| ( coin glpk )"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${PN}-1.3-as-needed.patch
 )
 
 src_prepare() {
-	sed -i \
-		-e '/ADD_SUBDIRECTORY(demo)/d' \
-		CMakeLists.txt || die
-
-	use doc || sed -i \
-		-e '/ADD_SUBDIRECTORY(doc)/d' \
-		CMakeLists.txt || die
-
-	use tools || sed -i \
-		-e '/ADD_SUBDIRECTORY(tools)/d' \
-		CMakeLists.txt || die
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory demo
 
-	use test || sed -i \
-		-e '/ADD_SUBDIRECTORY(test)/d' \
-		CMakeLists.txt || die
+	use doc || cmake_comment_add_subdirectory doc
+	use test || cmake_comment_add_subdirectory test
 
 	for t in \
 		max_clique \
@@ -60,22 +56,34 @@ src_prepare() {
 		-e '/ADD_TEST(lp_test lp_test)/d' \
 		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
 		test/CMakeLists.txt || die
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=TRUE
-		-DCOIN_ROOT_DIR="${EPREFIX}/usr"
-		-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
-		$(cmake-utils_use doc LEMON_DOC_SOURCE_BROWSER)
-		$(cmake-utils_use doc LEMON_DOC_USE_MATHJAX)
-		$(cmake-utils_use coin LEMON_ENABLE_COIN)
-		$(cmake-utils_use glpk LEMON_ENABLE_GLPK)
+		-DLEMON_ENABLE_COIN=$(usex coin)
+		-DLEMON_ENABLE_GLPK=$(usex glpk)
 	)
+	use coin && mycmakeargs+=( -DCOIN_ROOT_DIR="${EPREFIX}/usr" )
+	if use doc; then
+		mycmakeargs+=(
+			-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
+			-DLEMON_DOC_SOURCE_BROWSER=$(usex doc)
+			-DLEMON_DOC_USE_MATHJAX=$(usex doc)
+		)
+	fi
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	# TODO: Upstream needs to see the light of GNUInstallDirs
+	if use doc; then
+		mv "${D}"/usr/share/doc/lemon/html "${D}"/usr/share/doc/${PF} || die
+		rmdir "${D}"/usr/share/doc/lemon || die
+	fi
+}
+
 src_test() {
 	emake -C "${BUILD_DIR}" check
 }
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 1802bf9066b2..92e66a920f00 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>mmokrejs@gmail.com</email>
-  <name>Martin Mokrejs</name>
-</maintainer>
-<maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription>
-  LEMON stands for Library for Efficient Modeling and Optimization in
-  Networks. It is a C++ template library providing efficient
-  implementations of common data structures and algorithms with focus
-  on combinatorial optimization tasks connected mainly with graphs and
-  networks.
-</longdescription>
-<use>
-  <flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and
-  <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
-  <flag name="glpk">Enable GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name="tools">Build additional tools</flag>
-</use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		LEMON stands for Library for Efficient Modeling and Optimization in
+		Networks. It is a C++ template library providing efficient
+		implementations of common data structures and algorithms with focus
+		on combinatorial optimization tasks connected mainly with graphs and
+		networks.
+	</longdescription>
+	<use>
+		<flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
+		<flag name="glpk">Enable GNU Linear Programming Kit <pkg>sci-mathematics/glpk</pkg> support</flag>
+	</use>
 </pkgmetadata>