gentoo resync : 25.08.2020

3 files changed, 112 insertions, 0 deletions

diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index abe90e7467a7..c9209c252fe5 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,6 +1,9 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
+AUX gl2ps-1.4.2-cmake.patch 1959 BLAKE2B 28725bdca4ec50c4cdb19100d30d3af4fe5705709b0aad92c79ca9d732da862170d922e037da29a43e174bf16b773d9ec73c2034a5f67803dd9e3c97dbc2f4d5 SHA512 a76a7649e8b2b62de6669f1bf1d3f4797708ae659ba8cdf9b3da21319dbc56035876d1b233c5b8934ee93a6b3d1b6562376734c6ef1da8764910a30b8849fe17
 DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
 DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
+DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
 EBUILD gl2ps-1.3.9.ebuild 1245 BLAKE2B 4aceedc95a5adb17de36248fff3cb41e4439e2ce3624c396c52667352630fb865fb09b56b13277fcb3e4bf2bcb22f33a9106710b9d702dfe76c29f0c50a9c7e2 SHA512 3a8d32deec6854b23401e3068cd1174c13951c71c918791b4c82a5b81e58e1ceb701474a9c6fbb1856c932aafc6dae5c4bfed6ac9150c89b1c46646dbdfa5d14
 EBUILD gl2ps-1.4.0.ebuild 1240 BLAKE2B f367ea59dae36e5406444df3a8e8160c614ee30e742a7a7e471cade787996ce4fd0aec6bec00267df983e2f2492979e78e71085638db3a3a1c05888834c29a55 SHA512 7e1f233e1f6ec156aa1c7b7cb93f69287b2a2793266aa2b8a6c17fe2c00313336ce73f3e80eb315433e5a68fcabf6a4a615cac06d3ee4bda52449e66544069a8
+EBUILD gl2ps-1.4.2.ebuild 1185 BLAKE2B 73f830a9d5bd1a8ec5376e8d4ab7426340b65ebef8f09441e0b51943a0e78608bf2a5cb032563986688213cdfc5b349fcfa9afc680426cd8f45089cd0f59441f SHA512 a585d0be41f686e7694f75aeecc9057319571ce43a3bf02446baf1c88284c99dc70524ad164b456591bc04198fbe4679049fbcee1ea2dc794e5c786332be4ec1
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch
new file mode 100644
index 000000000000..9865c439aa78
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.4.2-cmake.patch
@@ -0,0 +1,58 @@
+--- a/CMakeLists.txt	2020-07-08 17:53:51.133105546 +0200
++++ b/CMakeLists.txt	2020-07-08 17:58:02.652237439 +0200
+@@ -50,4 +50,6 @@
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
+ 
+ set(GL2PS_MAJOR_VERSION 1)
+@@ -140,6 +142,4 @@
+ 
+ if(OPENGL_FOUND)
+-  add_library(lib STATIC gl2ps.c gl2ps.h)
+-  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+ 
+   add_library(shared SHARED gl2ps.c gl2ps.h)
+@@ -152,5 +152,5 @@
+         COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+   endif()
+-  install(TARGETS lib shared RUNTIME DESTINATION bin
++  install(TARGETS shared RUNTIME DESTINATION bin
+                              LIBRARY DESTINATION lib${LIB_SUFFIX}
+                              ARCHIVE DESTINATION lib${LIB_SUFFIX})
+@@ -160,15 +160,16 @@
+   set(GL2PS_DOC .)
+ else()
+-  set(GL2PS_DOC share/doc/gl2ps)
++  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
+ endif()
+ 
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++if(ENABLE_EXAMPLES)
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+ 
+-if(GLUT_FOUND)
++if(GLUT_FOUND AND BUILD_TESTING)
+   add_executable(gl2psTest WIN32 gl2psTest.c)
+   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+@@ -176,5 +177,7 @@
+   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif()
++endif()
+ 
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+@@ -195,4 +198,5 @@
+   endif()
+ endif()
++endif()
+ 
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
new file mode 100644
index 000000000000..d97b83f7cc60
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+	media-libs/freeglut
+	x11-libs/libXmu
+	png? ( media-libs/libpng:0= )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-tex/tth
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.4.2-cmake.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DENABLE_DOC="$(usex doc)"
+		-DENABLE_PNG="$(usex png)"
+		-DENABLE_ZLIB="$(usex zlib)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+			"${D}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+	fi
+}