gentoo (valentine's day) resync : 14.02.2021

5 files changed, 2 insertions, 275 deletions

diff --git a/media-libs/openctm/Manifest b/media-libs/openctm/Manifest
index 5491f9d41206..862d435d9a7f 100644
--- a/media-libs/openctm/Manifest
+++ b/media-libs/openctm/Manifest
@@ -8,10 +8,6 @@ AUX openctm-1.0.3-link-ctmviewer-with-libGLU.patch 747 BLAKE2B 9f2599e9cbe0dc8fd
 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-fix-makefiles.patch 6672 BLAKE2B 5cc7ad6b882bd4bb3cb05d112dd953807c029b39524bcb17c0f054b99fdf4bd3363d1807d0979c55cc6c746020236f99e48db2cf59b9ff62684e4e7963eb0681 SHA512 96cbe3775632d5b86ba5bb08b283707b5e89ffb0b837b2366f88955eb35341e02ea33de1b2562f87692b359d1b28a96833a163ec1d29f6f266cd641de972a527
-AUX openctm-no-strip.patch 1654 BLAKE2B e284556eb0d7866e527002bdbf291701654dd99a8353592c1dd5f93f6f74bbe4797da4bbc7960d4d7b875734fa4edbff68032c6835cbb26c0bb6f9cf0a471df3 SHA512 a38c4647a0113892d2294efec96efb073cec4d5771c383cd7454422195f230b0326610905534e758fb1f1bf36a6dca1810005f603f70d73584093b8895a99ec0
 DIST openctm-1.0.3-src.tar.bz2 1507603 BLAKE2B 379dad88ef3b069ee4167bdee8c1e86c6f1250c0db7bb108d12b6005f0cd19a4cafcaae51a8e1eddde7566fc9c8e361472268edb1806a5383f536d070ea4354a SHA512 fdfa08d19ecbfea99ba01aa2032e941ed6313394a96bd69f8984c2d2d079d836c616471d2bdf6f40175e75659f3ad0ba41502bc3d8224091472f40893ea8746e
-DIST openctm_1.0.3+dfsg1.orig.tar.bz2 179792 BLAKE2B 446fedc14e646b7cfc0aaac2d4f9b224482d74bf4faadd866b7121392e3863e3e42fe57f35654d4e9d7c056b3b8069dfb4668660d97ce7266d7850026654a88c SHA512 4ea8c9230e01b57fce4d741df77713df8fb0493fbb20c8d4b183e3e8cec16f97e8003d2569b1c7cac07a17d334711673c0fed0c6c050bbdb901028ee9f6c32f6
 EBUILD openctm-1.0.3-r1.ebuild 1408 BLAKE2B 58ceaaf66b0e27e567ea1fa03e2733df059fe3c2460c270315aff4d78d4e5431c84bdccf87f97770c32f3ed9eccd9185309a72c5b4c8ecb2ad2ac4a4cdd0f7d0 SHA512 383cad1ffdbdbd7238d5be19299a82dcca03a52764e7cd452dddf86579234106fadcddd298483058291695558f6e630c79a3c734ae0dd05aaaf3745200b846b7
-EBUILD openctm-1.0.3.ebuild 924 BLAKE2B 1cb9e32be2a294baa203a10675fa9b33321625a7c5129af388f906a96e3de4762d83146197b835032f9d78a511cd42f0920d27e5b7ecb4f035a934863d8cf6c5 SHA512 a75a3bb34941102b35be2c17023c5af6dba7851b322969bfa3fdf698fd20c6b4b632cd1c7e4c761046f4744616163ffbea45be80f71eee9bbe3c988d3ee92f0a
-MISC metadata.xml 665 BLAKE2B 04fec51f9d81997088613e4ca3b4d1d12643e597bbd91896d78a06c90886abaa857785895e8b29b8284afb975594a68c0a046b050360ad971bf964e596398bbe SHA512 79591a66512551c42e4d28d9abaccd3a564b0fb89fb12b52bba9b130704bc6f04d13565f7b0ec41f7b7b79454d49c2002e0aebf48e7e71665c78f8de2f9cb201
+MISC metadata.xml 733 BLAKE2B 7ea0e6029b6d34f1ebdd762fc2e20a331df83e8bcf34a37451c7f18dd261127795bc59d6eb91bd6479d6a10034cf046c1b08b6eef2412be25403ffa27aa3484d SHA512 26ecfbe9a152237fc20b9355781fdccb9e9bfc5a52382e6b4c242bb89d55b5f16f6f4eda177606a3f826a43e6d54404df8bddc1862d9f9c4dc73d045dbcf038c
diff --git a/media-libs/openctm/files/openctm-fix-makefiles.patch b/media-libs/openctm/files/openctm-fix-makefiles.patch
deleted file mode 100644
index 540b3cfa84fc..000000000000
--- a/media-libs/openctm/files/openctm-fix-makefiles.patch
+++ /dev/null
@@ -1,191 +0,0 @@
- Makefile.linux       | 18 ++++++++-------
- lib/Makefile.linux   | 23 ++++++++++++-------
- tools/Makefile.linux | 64 ++++++++++++++++++++--------------------------------
- 3 files changed, 50 insertions(+), 55 deletions(-)
-
-diff --git a/Makefile.linux b/Makefile.linux
-index 24ca137..51fc88c 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -47,19 +47,21 @@ documentation:
- 
- 
- # Installation settings
--LIBDIR  = /usr/lib/
--INCDIR  = /usr/local/include/
--BINDIR  = /usr/local/bin/
--MAN1DIR = /usr/local/share/man/man1/
--CP = cp
-+LIBDIR  = $(DESTDIR)/usr/@GENTOO_LIBDIR@/$(DEB_HOST_MULTIARCH)
-+INCDIR  = $(DESTDIR)/usr/include/
-+BINDIR  = $(DESTDIR)/usr/bin/
-+MAN1DIR = $(DESTDIR)/usr/share/man/man1/
-+CP = cp -P
- MKDIR = mkdir -p
- 
--install:
--	$(CP) lib/libopenctm.so $(LIBDIR)
-+$(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR):
-+	mkdir -p "$@"
-+
-+install: $(LIBDIR) $(INCDIR) $(BINDIR) $(MAN1DIR)
-+	$(CP) lib/libopenctm.so* $(LIBDIR)
- 	$(CP) lib/openctm.h $(INCDIR)
- 	$(CP) lib/openctmpp.h $(INCDIR)
- 	$(CP) tools/ctmconv $(BINDIR)
- 	$(CP) tools/ctmviewer $(BINDIR)
--	$(MKDIR) $(MAN1DIR)
- 	$(CP) doc/ctmconv.1 $(MAN1DIR)
- 	$(CP) doc/ctmviewer.1 $(MAN1DIR)
-diff --git a/lib/Makefile.linux b/lib/Makefile.linux
-index 7643127..1e622ec 100644
---- a/lib/Makefile.linux
-+++ b/lib/Makefile.linux
-@@ -27,13 +27,18 @@
- ###############################################################################

- 

- LZMADIR = liblzma

--CC = gcc

--CFLAGS = -O3 -W -Wall -c -fPIC -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM -std=c99 -pedantic

--CFLAGS_LZMA = -O3 -W -Wall -c -fPIC -DLZMA_PREFIX_CTM -std=c99 -pedantic

-+CC ?= gcc

-+CFLAGS += -W -Wall -c -fPIC -std=c99 -pedantic

-+INCDEF = -DOPENCTM_BUILD -I$(LZMADIR) -DLZMA_PREFIX_CTM

-+INCDEF_LZMA = -DLZMA_PREFIX_CTM

- RM = rm -f

- DEPEND = $(CPP) -MM

- 

--DYNAMICLIB = libopenctm.so

-+VERSION = 1.0.3

-+SOVERSION = 1

-+LIBNAME = libopenctm.so

-+SONAME = $(LIBNAME).$(SOVERSION)

-+DYNAMICLIB = $(LIBNAME).$(VERSION)

- 

- OBJS = openctm.o \

-        stream.o \

-@@ -64,16 +69,18 @@ LZMA_SRCS = $(LZMADIR)/Alloc.c \
- all: $(DYNAMICLIB)

- 

- clean:

--	$(RM) $(DYNAMICLIB) $(OBJS) $(LZMA_OBJS)

-+	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)

- 

- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

--	gcc -shared -s -Wl,-soname,$@ -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	ln -s $(DYNAMICLIB) $(SONAME)

-+	ln -s $(DYNAMICLIB) $(LIBNAME)

- 

- %.o: %.c

--	$(CC) $(CFLAGS) $<

-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF) $<

- 

- %.o: $(LZMADIR)/%.c

--	$(CC) $(CFLAGS_LZMA) $<

-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCDEF_LZMA) $<

- 

- depend:

- 	$(DEPEND) $(SRCS) $(LZMA_SRCS) > make.depend

-diff --git a/tools/Makefile.linux b/tools/Makefile.linux
-index fa3e6e5..46276d1 100644
---- a/tools/Makefile.linux
-+++ b/tools/Makefile.linux
-@@ -26,49 +26,50 @@
- ###############################################################################
- 
- OPENCTMDIR = ../lib
--GLEWDIR = glew
--JPEGDIR = jpeg
-+# Use system libs if possible
-+#GLEWDIR = glew
-+GLEWDIR = /usr/include/GL
-+#JPEGDIR = jpeg
- RPLYDIR = rply
--TINYXMLDIR = tinyxml
--ZLIBDIR = zlib
--PNGLITEDIR = pnglite
-+# rply in libvxl1-dev is version 1.1, we need v. 1.01
-+#RPLYDIR = /usr/include/vxl/rply
-+#TINYXMLDIR = tinyxml
-+#ZLIBDIR = zlib
-+#PNGLITEDIR = pnglite
- 
--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)
-+CXX ?= g++
-+CC ?= gcc
-+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)
--CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o glew.o pnglite.o $(MESHOBJS)
-+CTMVIEWEROBJS = ctmviewer.o common.o image.o systimer.o sysdialog_gtk.o convoptions.o $(MESHOBJS)
- CTMBENCHOBJS = ctmbench.o systimer.o
- 
- all: ctmconv ctmviewer ctmbench
- 
- clean:
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux clean
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux clean
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux clean
- 
--libopenctm.so: $(OPENCTMDIR)/libopenctm.so
--	cp $< $@
-+ctmconv: $(CTMCONVOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
--ctmconv: $(CTMCONVOBJS) $(TINYXMLDIR)/libtinyxml.a libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) -L$(TINYXMLDIR) $(CTMCONVOBJS) -Wl,-rpath,. -lopenctm -ltinyxml
-+ctmviewer: $(CTMVIEWEROBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
-+	-lgtk-x11-2.0 -lgobject-2.0 -lglib-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 `pkg-config --libs gtk+-2.0`
--
--ctmbench: $(CTMBENCHOBJS) libopenctm.so
--	$(CPP) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -Wl,-rpath,. -lopenctm
-+ctmbench: $(CTMBENCHOBJS)
-+	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
--	$(CPP) $(CPPFLAGS) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
- 
- ctmconv.o: ctmconv.cpp systimer.h convoptions.h mesh.h meshio.h
- ctmviewer.o: ctmviewer.cpp common.h image.h systimer.h sysdialog.h mesh.h meshio.h phong_vert.h phong_frag.h icons/icon_open.h icons/icon_save.h icons/icon_help.h
- ctmbench.o: ctmbench.cpp systimer.h
- common.o: common.cpp common.h
--image.o: image.cpp image.h common.h $(JPEGDIR)/libjpeg.a
-+image.o: image.cpp image.h common.h
- systimer.o: systimer.cpp systimer.h
- sysdialog_gtk.o: sysdialog_gtk.cpp sysdialog.h
- convoptions.o: convoptions.cpp convoptions.h
-@@ -91,22 +92,7 @@ phong_frag.h: phong.frag bin2c
- 	./bin2c phong.frag phongFragSrc > $@
- 
- bin2c: bin2c.cpp
--	$(CPP) -Os -W -Wall -o $@ $<
--
--$(JPEGDIR)/libjpeg.a:
--	cd $(JPEGDIR) && $(MAKE) -f makefile.linux libjpeg.a
--
--$(ZLIBDIR)/libz.a:
--	cd $(ZLIBDIR) && $(MAKE) -f Makefile.linux
--
--glew.o: $(GLEWDIR)/glew.c
--	gcc -c -Os -W -I$(GLEWDIR) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Os -W -Wall -o $@ $<
- 
- rply.o: $(RPLYDIR)/rply.c
--	gcc -c -O2 -W -I$(RPLYDIR) -o $@ $<
--
--pnglite.o: $(PNGLITEDIR)/pnglite.c
--	gcc -c -O2 -W -I$(PNGLITEDIR) -o $@ $<
--
--$(TINYXMLDIR)/libtinyxml.a:
--	cd $(TINYXMLDIR) && $(MAKE) -f Makefile.linux
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -O2 -W -I$(RPLYDIR) -o $@ $<
diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch
deleted file mode 100644
index 5e31d4017b68..000000000000
--- a/media-libs/openctm/files/openctm-no-strip.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux
---- OpenCTM-1.0.3.old/lib/Makefile.linux	2014-08-20 09:39:00.614744990 +0200
-+++ OpenCTM-1.0.3/lib/Makefile.linux	2014-08-20 09:40:09.782667989 +0200
-@@ -72,7 +72,7 @@
- 	$(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)

- 

- $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)

--	$(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

-+	$(CC) $(LDFLAGS) -shared  -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm

- 	ln -s $(DYNAMICLIB) $(SONAME)

- 	ln -s $(DYNAMICLIB) $(LIBNAME)

- 

-diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux
---- OpenCTM-1.0.3.old/tools/Makefile.linux	2014-08-20 09:39:00.583745025 +0200
-+++ OpenCTM-1.0.3/tools/Makefile.linux	2014-08-20 09:40:09.751668023 +0200
-@@ -52,15 +52,15 @@
- 	rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h
- 
- ctmconv: $(CTMCONVOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml
- 
- ctmviewer: $(CTMVIEWEROBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \
- 	-ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \
- 	-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0
- 
- ctmbench: $(CTMBENCHOBJS)
--	$(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
-+	$(CXX) $(LDFLAGS)  -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm
- 
- %.o: %.cpp
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 770fe31ee810..89e9808ac2d2 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -15,6 +15,7 @@
 		OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
 	</longdescription>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/openctm/bug-reports/</bugs-to>
 		<remote-id type="sourceforge">openctm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild
deleted file mode 100644
index c257f62436f5..000000000000
--- a/media-libs/openctm/openctm-1.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib versionator flag-o-matic toolchain-funcs
-
-MY_PV=OpenCTM-${PV}
-
-DESCRIPTION="OpenCTM - the Open Compressed Triangle Mesh."
-HOMEPAGE="http://openctm.sourceforge.net"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}+dfsg1.orig.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/tinyxml
-	media-libs/freeglut
-	media-libs/glew
-	media-libs/pnglite
-	virtual/opengl
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/openctm-fix-makefiles.patch \
-		"${FILESDIR}"/openctm-no-strip.patch
-	mv Makefile.linux Makefile || die
-	sed \
-		-e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}