gentoo auto-resync : 01:09:2022 - 19:24:10

4 files changed, 54 insertions, 13 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index c74339978c51..7723480091dd 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,8 +1,9 @@
 AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
 AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88
-AUX gmic-3.1.5-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0
+AUX gmic-3.1.6-makefile_automagic.patch 5378 BLAKE2B 161a06be29e9dc4ac9d4f6234d0da70831c2fd4be4f5f849a16957afee8b4436644591f0f5aecfdfb2b3b33b8ac4f65b8daa966afeb4ee97d340290fce83bfda SHA512 79157c017566e4d0b277169e9356dfaf71c2b46b7e70aa6c6bcc81c664006524bc8b2a86be83e88a1128c3dc527e294b5ea2a685d924975b8a22161e9adc6df0
+AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
-DIST gmic_3.1.5.tar.gz 10782647 BLAKE2B 9334f61b4309dec31d5dd0c52b87a97628bfa819602f3bac03cbc74c26a65dc660c0f4ae5c84d2aba5062ebc2869ae3d656e6fc2b2f9c9d0565d07762a920d21 SHA512 7e27856db8b68fde33e50f09a9d07479b67843388a98edc891deab51828d922200af20afee163984e0c7660e46387d1fe514d35ac3e3d9c8ebe02b0aa89cbc96
+DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 EBUILD gmic-3.0.1-r1.ebuild 4192 BLAKE2B e9da6acf816933b7a0e7becbe3f78dce521a05838ca397fc5e1d29154fa975eaa60cc9ca3fcd8c6287b1eac442382792dc4c1acf66a4376e7aa21968e74b1a9e SHA512 db4b500e695e6cc80b1b5b0df04659acf60e7018cf50f2c6a97fa325b070e20bdf180aaa46e1a693cab485cc00a1823cce1943306f4b9ed97d261bc490464684
-EBUILD gmic-3.1.5.ebuild 2567 BLAKE2B 307837ecf74743536e6094c599ffa217d6f968327652d50bc09dab81ae4d676d84b549771ba2fec71f9c32a464838b4ee3d225d9d9574fe332ceee2f22957c42 SHA512 3f176c15d09d0b3ca12a002291e538841e10cf3456dc7043c3fe9b66974e6c37ade6fe42e3862af54dbe8233e98a2ebae30e9bddc9cf93895936c989763ef570
+EBUILD gmic-3.1.6.ebuild 3471 BLAKE2B 3160f9ad8eaff999ebbf215bb5e94edaad9dec21effb257491dec57555895658287a90335a15064eb8cb94264b9d2ca84a045499d49e26803097688ee6550b82 SHA512 7400b70db9ea9f4a769a9be3ab045582627bc127aeb59011102531ca120327793604e58a7765228b14aef2de6e945cfa84376086de4fdd1ab014d2a6607bb259
 MISC metadata.xml 466 BLAKE2B aef1ab7a346d34ebdba8f6e09298d1bd96ed2771307fbd3e3cc15ed0774da1c29be9a3b260b9a7c287ce904685f708e56d59953fb92bf4d93d52227614f3c148 SHA512 755bfb920c6baa950716dff8a345540a730b1c6d179837d81ce1e1a3dcdc826665b61f9da8dcd007c44893f3310ace5dfe2a976a80926ab96170cb84a3f3555c
diff --git a/media-gfx/gmic/files/gmic-3.1.5-makefile_automagic.patch b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
index 8dbe50d6e194..8dbe50d6e194 100644
--- a/media-gfx/gmic/files/gmic-3.1.5-makefile_automagic.patch
+++ b/media-gfx/gmic/files/gmic-3.1.6-makefile_automagic.patch
diff --git a/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
new file mode 100644
index 000000000000..e2da793f31a8
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.1.6-relative_rpath.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -187,7 +187,7 @@
+ ifndef NO_SRIPDLIB
+ MANDATORY_CFLAGS += -std=c++11 -pedantic
+ endif
+-MANDATORY_LIBS += -L. -L$(USR)/$(LIB) -Wl,-rpath,.
++MANDATORY_LIBS += -L. -L$(USR)/$(LIB)
+ ifdef IS_GCC
+ MANDATORY_CFLAGS += -Wall -Wextra -Wfatal-errors -Werror=unknown-pragmas -Werror=unused-label
+ GCC_VER_GTEQ5 = $(shell expr `$(CXX) -dumpversion | cut -f1 -d.` \>= 5)
diff --git a/media-gfx/gmic/gmic-3.1.5.ebuild b/media-gfx/gmic/gmic-3.1.6.ebuild
index 4555221810cb..06ca0c8a4cc3 100644
--- a/media-gfx/gmic/gmic-3.1.5.ebuild
+++ b/media-gfx/gmic/gmic-3.1.6.ebuild
@@ -24,9 +24,6 @@ REQUIRED_USE="
 	qt5? ( png fftw X )
 "
 
-# No test suite, hand-crafted Makefiles barf out on 'emake check'
-RESTRICT="test"
-
 MIN_QT_VER="5.2.0"
 QT_DEPEND="
 	>=dev-qt/qtcore-${MIN_QT_VER}:5
@@ -61,12 +58,16 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools:5 )
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.5-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.1.6-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.1.6-relative_rpath.patch
 )
 
 pkg_pretend() {
@@ -79,6 +80,12 @@ pkg_setup() {
 
 gmic_emake() {
 	emake -j1 -C src \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		STRIP="/bin/true" \
+		LIB="$(get_libdir)" \
+		OPT_CFLAGS="${CXXFLAGS}" \
+		OPT_LIBS="${LDFLAGS}" \
 		GMIC_USE_CURL=$(usex curl) \
 		GMIC_USE_EXR=$(usex openexr) \
 		GMIC_USE_FFTW=$(usex fftw) \
@@ -94,14 +101,36 @@ gmic_emake() {
 }
 
 # FIXME:
-#  - do not pre-strip binaries
-#  - honour user LDFLAGS on lib{,c}gmic.so
-#  - fix multilib-strict violation on same
-#  - nuke relative DT_RUNPATH on same
-#  - GIMP plug-in dir should only be created if USE=gimp, otherwise it ends up being just /plug-ins
+#  - honour user CFLAGS while building C binaries (i.e. 'use_libcgmic')
 src_compile() {
 	gmic_emake lib libc
 	use cli && gmic_emake cli_shared
 	use gimp && gmic_emake gimp_shared
 	use qt5 && gmic_emake gmic_qt_shared
 }
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}