gentoo resync : 28.04.2021

6 files changed, 16 insertions, 14 deletions

diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 862d435d9a7f..c52029dbcdd8 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -1,13 +1,13 @@
 AUX openctm-1.0.3-create-lib-with-correct-soname-and-symlinks.patch 722 BLAKE2B 09a4cbfb50cfbadd4367e6f944169cb10b59a11b060c76422f3d2147ca8e1ac233b1d0c41dcef4c155ac04f9bcb13b84227dab19c776e89fb20a10bb849d29ac SHA512 86a2232fbb58d1d4d262512963016ed3e9372c22f5f7f85560f47b05332e6f3c10c3029f16318c79bea9dc5968089dace880afaa4e325ffe9e09fcb635099a17
-AUX openctm-1.0.3-do-not-set-rpath.patch 895 BLAKE2B 8cda8a3c13d5bb2db05bfca4b17b1f2405c33f137720b4a5dc7944e8857ffb7eddfd6a2566cd5e4facd0e39b18f0f6f9cd6a8701e75a12ad617874415168545e SHA512 e3a0fe886cdabd2f7fa52f2c1fc268d94230cd101838a3d4260054b412d70e58e1c195837cd8a01895d05c97da171a86919205ad3fd05757818c9b342b431bce
+AUX openctm-1.0.3-do-not-set-rpath.patch 901 BLAKE2B 46ad1a63d8c12ee4d983ac0026a8d04b7ae0991ba7bf4eff8196201225e1aff1a85287338474be2b893537d78064d1406dbbdad9133fb2f46be727e1f9aef446 SHA512 b67d34671b6659251af8d8df3aca298e8684840d6bc1e84d1895265c0cd7758e23bc9ce7ee0cde2e47f3efccdd16c7fbf0c67abfea945c336d7b79382c750a3c
 AUX openctm-1.0.3-escape-hyphens-in-ctmconv-man-page.patch 305 BLAKE2B f5ca2982837b86e25c87aaec43f50cd45d5037228c846f5b35acf0b214b6b34f8528297213303374cd2e77c347cdb443659b820d891f1b2ce9f68e5237727615 SHA512 40469f718f28db9caad6fcaa2728c7a3c56d5ad60c0d39929e871d9348801ad2aef2cbe5112cb785f9d2b794209bfd2bbe9d5d583ad77567a632c8e21efbfab1
 AUX openctm-1.0.3-fix-install-paths.patch 838 BLAKE2B 4849dc0ecc20f9b3a8bdbe1a033696b4755c6254e6e5b55838b5e60999cda52466d8f34e8444ec5666f19254a285e7fd2cb5cf344af2377c7a09ed1dfdf867dd SHA512 d1c47b171636cfdeebeb310c7553e9fba18e7b36a66e2659a32a5ea878ee3f17f842ac4fcba34e965dbc1865f17f4883f569763ca3ec12adfc55d944997b8e53
-AUX openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch 559 BLAKE2B e0a09ed99bc50957051f7867183c95ec7df43cbf17e4285ebb0cc43414eb7289260dd4288afe3a8355c18c7d20df4cdeb88b63cf8ef9f726943a1cba56756600 SHA512 4d0d6a0f64c9095a38874471d638c31657c8df5f53a803b43ee1e2e8794ecf519075de95dcfaff3bfa62af14a7c534b4abac9869188a368e4b3bc2c5eafd679b
+AUX openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch 562 BLAKE2B 6b7cfd1861861fc662769fdc10c7d499def19942a15d6f5dc7d029fee01d375dca70d9a3becc06a2b53550b245850013fd0484f74e6335509718b2fbdba2d5ff SHA512 eb62a22af8c9f05f2d5367e7fc8313a02f01e8f1762562a024d80b237b0133bca8bc96bba8f9e2f78cb890789f7a1decf44d116db13af4ae1b7c1cb8fb5ec1cf
 AUX openctm-1.0.3-link-ctmviewer-with-libGL.patch 349 BLAKE2B d1d8571b867c735df8418d119b50327d6899509e9bf4bd19abd25272797e5c794671c0af67ed693d33a30c666eafb03b2fe460015a154e4b99fff8846022ff8e SHA512 a1c00ae7a8f77b0bc6fc1a437352726cb42fdacb98bb17c4d4bd1f1ca2d92c552c5805ff7115f00d64610e10ad397bfdd26c0c7937eb0a74805a8f9e631257d4
 AUX openctm-1.0.3-link-ctmviewer-with-libGLU.patch 747 BLAKE2B 9f2599e9cbe0dc8fd0ed6b801ce2afa82fd216caa218e28d264aa64a33d1a1eb24e0080bf20bfc7231244253b7e654121def33df7ce8e9735d89c1c04861efb7 SHA512 71a6a4ce3bc352f376f83d7bb26167159bb3aa8f45d3e1134cb703a16a847453eb60de2b50c2aa470e77b837d260375832d5a3941de54891063ab0c169a38d98
 AUX openctm-1.0.3-no-strip.patch 1272 BLAKE2B 78cceaee9185d913d06bcd4ca61447c45cab782388401ff71842fe093bc1f0ef76ec90d0e27a752d3a78f2782ef6cf7b8fdbd773016e465acff6aaf4430ec69d SHA512 a808a499b5a3162831d7b7d67433ef71f1f31e634e2f5057f4f19b59ee962e0379eadad57342a3a24f9891809c2b24adc83abcc311fef990d97446d4baa318cb
-AUX openctm-1.0.3-respect-flags.patch 2931 BLAKE2B fa6b99c7fa46ce5a0f1790cbf89ac45ac19ea939ff165cece87e419f1c902de8d3528c82ad800da079aa07b4f03fd33df47eed07bb61cb60d3326146f91e6153 SHA512 a6d6efa9df63835cb0990906a5755cc6d673a48377af1f28b880384051e4cb2380deae13eff864c179e7e98b3e0319e993c639609bc8b482e3ea37fbf4cb21cd
-AUX openctm-1.0.3-use-system-libs.patch 3289 BLAKE2B d0402954c36ea42372fd65858ef1166fd519e133b3f2f4e5770fd5a76f9f8dc31354749df7af97b7bf050b47c6327f7aa6253eeb7cd4225c55c1dc6e1ac3aebd SHA512 a12e45f703373749e1c71ddfb11576d056b2970de32800bf6fa46332cb23c8e6c5e3e741bc30468599b7a66918e9bd1140e50d5963fba5c71dfaa6649d64a66a
+AUX openctm-1.0.3-respect-flags.patch 2937 BLAKE2B 4c3d1c435bccfc67bef5a1647384d22c6084b816ff28bab2be762f73d85994e962b4898bd45431b5cc45cfc316c01e8f3c90f17c559fa46967c7c09a0571ab05 SHA512 0f0a1baa97345586bfb82645ecd9afe3dafde8dae97d92e3e8fbd14576838be3ab1cae141e1c634118404bdae022bf4517350d680aabc4ddcbb4d1cbee2269b0
+AUX openctm-1.0.3-use-system-libs.patch 3295 BLAKE2B c837257274c0cb923d04ac0cbba66dd9a693b24370721758678fc6e52da3b07e477cb8317f4fb08f12e8d6c89b06b6cfb3ab93c9e6d26a88b654a562072fe16e SHA512 c68c3c42bdede730083d3e27dbe9a8d33f5e5907e4d7c541408a1f18ed56e889be28c4d8c4c61a01d1ed4111d27b04127bbd1295ddcb66b2a0f71fcd9d72a386
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-EBUILD openctm-1.0.3-r1.ebuild 1408 BLAKE2B 58ceaaf66b0e27e567ea1fa03e2733df059fe3c2460c270315aff4d78d4e5431c84bdccf87f97770c32f3ed9eccd9185309a72c5b4c8ecb2ad2ac4a4cdd0f7d0 SHA512 383cad1ffdbdbd7238d5be19299a82dcca03a52764e7cd452dddf86579234106fadcddd298483058291695558f6e630c79a3c734ae0dd05aaaf3745200b846b7
+EBUILD openctm-1.0.3-r1.ebuild 1450 BLAKE2B 0529d1ad697ee4f9c696a35434ec552864c2615d80ac83af206931d5f310dd2263a3053fcfb3b270ea59b380814ddf9a8014b4c2fffee47d5a00dfeffcea0c8b SHA512 57641cca20d7dafd9e223e0bdad3dda73ab8662a1e49ad7795b16b4d7e21891de5b584da937881babb6d5d1cc63a52d91c8e0f542f5a40210f22412dd16ef68e
 MISC metadata.xml 733 BLAKE2B 7ea0e6029b6d34f1ebdd762fc2e20a331df83e8bcf34a37451c7f18dd261127795bc59d6eb91bd6479d6a10034cf046c1b08b6eef2412be25403ffa27aa3484d SHA512 26ecfbe9a152237fc20b9355781fdccb9e9bfc5a52382e6b4c242bb89d55b5f16f6f4eda177606a3f826a43e6d54404df8bddc1862d9f9c4dc73d045dbcf038c
diff --git a/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
index e80e5cf34b4c..89a4575a139b 100644
--- a/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-do-not-set-rpath.patch
@@ -8,8 +8,8 @@
 +	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
 
  ctmviewer: $(CTMVIEWEROBJS)
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
-+	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 
  ctmbench: $(CTMBENCHOBJS)
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
diff --git a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
index 370960721b5c..77512ba3c70c 100644
--- a/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-link-ctmviewer-only-with-necessary-gtk-libs.patch
@@ -4,7 +4,7 @@
  	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
 
  ctmviewer: $(CTMVIEWEROBJS)
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
+-	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 +	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
 +	-ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW \
 +	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
diff --git a/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
index 4a406d0caf88..753c820ff2da 100644
--- a/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-respect-flags.patch
@@ -39,8 +39,8 @@
  RPLYDIR = rply
 
 -CPP = g++
--CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
-+CXXFLAGS += -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
+-CPPFLAGS = -c -O3 -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
++CXXFLAGS += -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
 
  MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
  CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
diff --git a/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
index e6d158c6c3b1..be2f9b65c14c 100644
--- a/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
+++ b/media-libs/openctm/files/openctm-1.0.3-use-system-libs.patch
@@ -14,7 +14,7 @@
 
  CPP = g++
 -CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(JPEGDIR) -I$(TINYXMLDIR) -I$(GLEWDIR) -I$(ZLIBDIR) -I$(PNGLITEDIR)
-+CPPFLAGS = -c -O3 -W -Wall `pkg-config --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
++CPPFLAGS = -c -O3 -W -Wall `${PKG_CONFIG} --cflags gtk+-2.0` -I$(OPENCTMDIR) -I$(RPLYDIR) -I$(GLEWDIR)
 
  MESHOBJS = mesh.o meshio.o ctm.o ply.o rply.o stl.o 3ds.o dae.o obj.o lwo.o off.o wrl.o
  CTMCONVOBJS = ctmconv.o common.o systimer.o convoptions.o $(MESHOBJS)
@@ -39,7 +39,7 @@
 -ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
 +ctmviewer: $(CTMVIEWEROBJS)
-+	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `pkg-config --libs gtk+-2.0`
++	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lpnglite -lz -lglut -lGLU -lGLEW `${PKG_CONFIG} --libs gtk+-2.0`
 
 -ctmviewer: $(CTMVIEWEROBJS) $(JPEGDIR)/libjpeg.a $(TINYXMLDIR)/libtinyxml.a $(ZLIBDIR)/libz.a libopenctm.so
 -	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) -L$(JPEGDIR) -L$(ZLIBDIR) $(CTMVIEWEROBJS) -Wl,-rpath,. -lopenctm -ltinyxml -ljpeg -lz -lglut -lGLU `pkg-config --libs gtk+-2.0`
diff --git a/media-libs/openctm/openctm-1.0.3-r1.ebuild b/media-libs/openctm/openctm-1.0.3-r1.ebuild
index e4014df8c998..c77dbee3d4ba 100644
--- a/media-libs/openctm/openctm-1.0.3-r1.ebuild
+++ b/media-libs/openctm/openctm-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit edos2unix flag-o-matic toolchain-funcs
 
 MY_P=OpenCTM-${PV}
 
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
+DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh"
 HOMEPAGE="http://openctm.sourceforge.net"
 SRC_URI="https://downloads.sourceforge.net/project/openctm/${MY_P}/${MY_P}-src.tar.bz2 -> ${P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}"
@@ -16,7 +16,6 @@ LICENSE="GPL-2"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
 DEPEND="
 	dev-libs/tinyxml
 	media-libs/freeglut
@@ -28,6 +27,7 @@ DEPEND="
 	x11-libs/gtk+:2
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-escape-hyphens-in-ctmconv-man-page.patch"
@@ -49,6 +49,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake CC=$(tc-getCC) CXX="$(tc-getCXX)" -f Makefile.linux
 }