gentoo resync : 23.09.2020

5 files changed, 46 insertions, 64 deletions

diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest
index 7d22968a298c..31ad75be76d6 100644
--- a/media-libs/SoXt/Manifest
+++ b/media-libs/SoXt/Manifest
@@ -1,4 +1,3 @@
-AUX SoXt-1.3.0-pkgconfig-partial.patch 399 BLAKE2B 6ab8dffa553b9bc8f5de9f3fc0fdf708bcebe538249248bd98391016773c6511289cc37959e6911e9aa32e1c1f8beb282226fab995f4877fcdfcbb6833effa3e SHA512 e541eafed5e4119c5c32e3599a1783a54fdf121ad813bd22ccee3ffafbd5d0433d14273ceb81164894a6d6adb6fb271302b90bcbc98684ec2cbf5e95d0b0e7ff
-DIST SoXt-1.3.0.tar.gz 1203903 BLAKE2B da64285656b57c7b90bb3dfba089dbea79ce6755aa36cee2fca1e64ad4945099e68474263a16ac97b34187207266b025734c352656c972fe66402717b94c9340 SHA512 1aae8c6d0b5e8de52734dac0326f9bcbae343a1819d18bb915f8f6fa223782e3512286819af62f494ce5238b8e1d981af5322186b2c07a94be20b7c9d32db208
-EBUILD SoXt-1.3.0-r1.ebuild 1161 BLAKE2B c9fed130130f272bcbebe4198344dc6930efb04b6427bfae1210ef394c85b3b7c8689ada30e0400f9de9d099e31cf2720056d422887afdc9d69570ca5d40b0ee SHA512 826f5c1db92a409a426bdd6ddd952eff2e1462cd20a316595ac3406b1d4cde31534cf4b05723c329bad5eff282ecd17f4df580e2383cb153ff95db05ebc66a1a
-MISC metadata.xml 661 BLAKE2B 5b9818fd889838daaa125c9a3080b5924fc5c6d1781ecfd6dce03636153d867ffce56d5e7273bacf5cb087987eff5d88856d4b9fb86053b43d40d2646a0071b5 SHA512 c45a1eb5c1323637eb393dd764fda106aae1447c71fa7ae34f80aea114df248b9d2d36623e202e13da9844b6f37b42b231b7bc775c5f56bf7a3a23e7b2c66210
+DIST SoXt-1.4.0-src.tar.gz 1369725 BLAKE2B 727c56644878e9d52441ca905558524ccd369de123e8018d7fef4d949aa4e96007fa3a1e9782490b4dc9d50a916686a118d37ec7094dc6a3522ede032b30b6ea SHA512 9c661396ec18c2cba8984be8c0875f51554c8845e1a85d9b202f9a0f4de8203566a46d9b276e20039861dbf7ff3a0ffa474d098866f8a7692b53a01e3f62977d
+EBUILD SoXt-1.4.0.ebuild 950 BLAKE2B e555ffb3b935e245ef6986324ea6bae7228fd1a7b11dc7cc9ebc6cbf3e7c36147acec9dce08cb3e4a56ffdc335c96b0b7868ac1d574ff4f8b73c1865a643e6b8 SHA512 20d8adde382b2e5a63bb6a9b77e885d02bd46104e1107f6583c91e617234005f8b4614f6d10e203344313113d631576de36378bca6f1a6b5e2d5433411c1fa9c
+MISC metadata.xml 658 BLAKE2B af9655bc4c38124b85e5745164c0ace9fd469a33f067ec598b17196f159f98e295362baef0af6a5b5eba3c76e0fc2a86c06899a461b83b601f2d633f55edbb22 SHA512 07dc1b45ca384e039b2e7efa7ed26eb63172602a6e2fdae40016469b122709161719764d933b6777245385d0d02ccd4a23c6ed821c5b0433eb27ecd2a19af94d
diff --git a/media-libs/SoXt/SoXt-1.3.0-r1.ebuild b/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
deleted file mode 100644
index 9a19d7672949..000000000000
--- a/media-libs/SoXt/SoXt-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-HOMEPAGE="http://www.coin3d.org/"
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
-SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="debug doc static-libs"
-
-RDEPEND="
-	<media-libs/coin-4
-	x11-libs/motif:0
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.0-pkgconfig-partial.patch"
-)
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt)
-
-src_configure() {
-	local myeconfargs=(
-		htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		--disable-compact
-		--disable-html-help
-		--includedir="$(coin-config --includedir)"
-		--with-coin
-		--with-motif
-		$(use_enable debug)
-		$(use_enable debug profile)
-		$(use_enable doc html)
-		$(use_enable doc man)
-	)
-	default
-	# Remove SoXt from Libs.private (patch installs it in Libs)
-	sed -i -e '/Libs.private/s/ -lSoXt//' SoXt.pc || die
-	# Strip the default libdir
-	sed -i -e "s,-L%{_libdir} ,," soxt-default.cfg || die
-}
diff --git a/media-libs/SoXt/SoXt-1.4.0.ebuild b/media-libs/SoXt/SoXt-1.4.0.ebuild
new file mode 100644
index 000000000000..0915565de4dd
--- /dev/null
+++ b/media-libs/SoXt/SoXt-1.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+MY_P=${P/soxt/SoXt}
+
+HOMEPAGE="https://github.com/coin3d/coin/wiki"
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
+SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="debug doc"
+
+RDEPEND="
+	media-libs/coin
+	x11-libs/motif:0
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/soxt"
+
+DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt)
+
+src_configure() {
+	use debug && append-cppflags -DSOXT_DEBUG=1
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DSOXT_BUILD_DOCUMENTATION=$(usex doc)
+		-DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF
+		-DSOXT_VERBOSE=$(usex debug)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch b/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
deleted file mode 100644
index d9f1ad25eeff..000000000000
--- a/media-libs/SoXt/files/SoXt-1.3.0-pkgconfig-partial.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/SoXt.pc.in	2013-06-17 11:26:59.998321839 -0700
-+++ b/SoXt.pc.in	2013-06-17 11:28:01.603654611 -0700
-@@ -10,7 +10,8 @@
- Version: @SOXT_VERSION@
- Requires: Coin
- Conflicts:
--Libs: -L${libdir} @SOGUI_EXTRA_LDFLAGS@ @SOGUI_EXTRA_LIBS@
-+Libs: -L${libdir} -lSoXt
-+Libs.private:  -L${libdir} @SOGUI_EXTRA_LIBS@
- Cflags: -I${includedir} @SOGUI_EXTRA_CFLAGS@ @SOGUI_EXTRA_CPPFLAGS@
- 
- soxt_host=@host@
diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 418672b1b7bb..a49ad79eefb2 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -12,6 +12,6 @@
   from SGI or TGS.
   </longdescription>
   <upstream>
-    <remote-id type="bitbucket">Coin3D/coin</remote-id>
+    <remote-id type="github">coin3d/soxt</remote-id>
   </upstream>
 </pkgmetadata>