gentoo resync : 10.02.2020

3 files changed, 46 insertions, 33 deletions

diff --git a/media-libs/sg/Manifest b/media-libs/sg/Manifest
index 3cedd2d418dc..e61b55fd05b0 100644
--- a/media-libs/sg/Manifest
+++ b/media-libs/sg/Manifest
@@ -1,5 +1,6 @@
+AUX 1.4-AC_CONFIG_HEADERS.patch 316 BLAKE2B ebb73f3d30357cc0ab97c0e79dfa05c2de2d39d0814458191485855962780fc6b81db115f914f20e3aa55922dee76f932dd04c59eb42b83baaeaf1fcf678afa6 SHA512 84e6309e50300b514d64ac0f0f4a47900b7497f208c617d515fbba6344dc286b74bad145beb6779a2b5c78ea7e96c3a283ba443492d485a632e889fda834e496
 AUX 1.4-doc.patch 526 BLAKE2B 907c7a978d1906e4e647440b2dfc3602aa46ff8ba87010c215845070f5f221a6ae505dc428cd408ba80890db383f726f6762d01b5312609397a67cb5b4883c89 SHA512 9e9d48b51264c5d91ef3536630dee112001dd7b2e55a7a3024165f3249efe187b0a77a5fd5b12858c33c3c1171c5f2fe72c4eaf76ddc2d9a7d17b593396cb63d
 AUX 1.4-opengl.patch 2304 BLAKE2B e604cded6b4e1f3fcd0f4bc5e05d5dc1ec1870c6c70ea54f142cb2148610eba6863e1be8507bffcf38cae373b8cdfb6243f873325a00a5a38d7f5af895daad5f SHA512 9ef41aff50c7676ef1f2cd9ab6ffe966ee0761cfc748078d76f46d5f2f40107fac9717ebbe93713a8a7196cc23179b3bf4ec9904be80434d2958e133aea990c6
 DIST sg-1.5.tar.gz 2859299 BLAKE2B f1c2f1a10f73e719a531f80971114a3175e20863aea1d864a142cfbea8d6212801719ca4f727825aa1e54d3c26f202edde61b1ec126e61fad0ed260900320116 SHA512 0e1f931b51e7bdecedc1bb17275d87e7549abf3d4d9eff6daf74cbc97ad1bea94b256fe4accfe27bd0a67f0637bb0d3b363d748f57edd73e07e922d2ea6e24c0
-EBUILD sg-1.5.ebuild 1688 BLAKE2B b7beb7d1ea84c9d0c3abada01807dc4b860b1da49875f0103fc76c80aa7c22dab6dc5ee1d413fac3282fb4ec4011facecb4ac2ce09c25081f5bd25250b42432b SHA512 9bbca854f7d7a078c2bc02fefd8647568445b4b4a1b5859a8aff4e95360f26c5c36410182b552e1b991ec8e20751525d9544d72fbc4995a0ec09f2b2e9135863
+EBUILD sg-1.5.ebuild 1603 BLAKE2B ef185b090e675d826e58de24b8ab04ab56f731113e6cb5985b60229d45216115d90dcc97f5c1cb9d05c1749f709e26ab830383e16333d0c06ef748dc410d55c8 SHA512 27d40f7429a973d5d41a53e0861f0a7c46113aff28d9ceb30f55e279dbe6d2f8e0d3e52c125f1f8c06a259ebf2d3476bfa36bd2a85b3b682e890e94344ef6ecc
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
new file mode 100644
index 000000000000..f57b6110593f
--- /dev/null
+++ b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@
+ dnl 0. autoconf initialization
+ AC_INIT(sg, 1.0, mholst@math.ucsd.edu)
+ AC_CONFIG_SRCDIR(src/ogl/sg/ogl.h)
+-AM_CONFIG_HEADER(src/aaa_inc/sgcf.h)
++AC_CONFIG_HEADERS(src/aaa_inc/sgcf.h)
+ AC_CONFIG_AUX_DIR(config)
+ AC_PREFIX_DEFAULT(${HOME})
+ AC_CANONICAL_BUILD
diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
index ba5e44642aa6..a172a6b00e68 100644
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@@ -1,57 +1,52 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Socket Graphics tool for displaying polygons"
 HOMEPAGE="http://fetk.org/codes/sg/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-libs/maloc
+	media-libs/mesa[X(+)]
 	virtual/glu
+	x11-libs/libGLw
 	x11-libs/libXaw
-	x11-libs/motif
-	|| (
-		( media-libs/mesa[X(+)] x11-libs/libGLw )
-		media-libs/opengl-apple
-		)"
-DEPEND="
-	${RDEPEND}
+	x11-libs/motif"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
-		media-gfx/graphviz
 		app-doc/doxygen
-		)"
+		media-gfx/graphviz
+	)"
 
 S="${WORKDIR}"/${PN}
 
 PATCHES=(
 	"${FILESDIR}"/1.4-opengl.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+	"${FILESDIR}"/1.4-AC_CONFIG_HEADERS.patch
+)
 
 src_prepare() {
-	rm src/{gl,glu,glw} -rf || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
+	default
+	rm -r src/{gl,glu,glw} || die
+
+	eautoreconf
 }
 
 src_configure() {
-	local sg_include
-	local sg_lib
-	local myeconfargs
+	local sg_include="${EPREFIX}"/usr/include
+	local sg_lib="${EPREFIX}"/usr/$(get_libdir)
 
-	sg_include="${EPREFIX}"/usr/include
-	sg_lib="${EPREFIX}"/usr/$(get_libdir)
 	export FETK_LIBRARY="${sg_lib}"
 	export FETK_MOTIF_LIBRARY="${sg_lib}"
 	export FETK_GL_LIBRARY="${sg_lib}"
@@ -63,13 +58,19 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"
 
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--enable-glforce \
+		--enable-gluforce \
+		--enable-glwforce \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen "") \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot "")
+}
 
-	myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce )
+src_install() {
+	default
 
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-	)
-	autotools-utils_src_configure
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }