gentoo resync : 29.01.2021

3 files changed, 301 insertions, 0 deletions

diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 560cd26248bd..92ae5fcc121c 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -2,6 +2,8 @@ AUX plib-1.8.5-CVE-2011-4620.patch 415 BLAKE2B a6a059765551313653b0eb8d060d88cd9
 AUX plib-1.8.5-CVE-2012-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee373a4cf77278eecda1b26b6c02f8971d92f85b974e9fccbf7ff10af13ff4e54af6d7377140010f9a3113c86a6018bf0c SHA512 a09462ecb085703aae7cd3b77954cc800410aa37a9616255cca2f21456e6d5dcf8ead3f684c98236deb1455c6a034dc8ec874bafdbab003f7a63517ea1f8350d
 AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1613e0cbddcfb90ae250d87b672d1738d854c9d546ec1d5d8ebf78b501e3dca9e41dc7e1f891b101e3c0ca23c SHA512 3222424f668ba4267d150034fc3ac67770501c543cdd7849c8eda4d491d7cb4d3120101c7d548a20d3122561f0f27e8fb0592773c736d7fbf4bc500121bf9dc3
 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560
+AUX plib-1.8.5-shared-libs.patch 9520 BLAKE2B 1bfb85c5065e33a9c8be14861f4fd8978e1dcacf4c045c9b1e30dfd2715873ac1b953bfeed5e298e1140264f8c0d191bef28b6631e2bb98f4d7228c7576aaf9c SHA512 0fb342e726412885531188a05e3b05b2076398b1ec8eaaf22ba3e20f48248351917d5418a7086b1b8eeb0bfccae049e8cfa0f5d05cbd4bb7c20c3e69685065b5
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
 EBUILD plib-1.8.5-r2.ebuild 829 BLAKE2B ccf66bea4824b818c08a421975d5b89dfc9403e36504dddd66b41b0119e47b70b30cc1727464ff9545e591b0a3cbf679dad89048f634173e15ef190d5ac31c86 SHA512 9c2810449ce8aa529a360dabbaf7d8bff92dccb9def0bff12cf3e580517e0c297391e3a32e0009d93bfd2b806e895761b96b4fbb94adc521b56294c5bbbc6105
+EBUILD plib-1.8.5-r3.ebuild 931 BLAKE2B 51588a228414d77dd489d565034b0fd9dcecae5cae5806986e8a6effbf579f975db822fd3aa1807009da95d217dd0218e5770e23e05658858eca3a17b369e391 SHA512 da983d8417348d980d4d3e205e269808c37faa1b42778f3229e5a93fd5fbf9c85ef8ff2f715c9011700921d63466bd9f613abace807d0e386baf8f006344dfdd
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/files/plib-1.8.5-shared-libs.patch b/media-libs/plib/files/plib-1.8.5-shared-libs.patch
new file mode 100644
index 000000000000..6ed51fd7dd75
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.5-shared-libs.patch
@@ -0,0 +1,256 @@
+diff -ru ../plib-1.8.5/configure.in ./configure.in
+--- ../plib-1.8.5/configure.in	2008-03-11 03:09:43.000000000 +0100
++++ ./configure.in	2010-07-02 05:27:45.478055160 +0200
+@@ -36,7 +36,7 @@
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ 
+ dnl Command line arguments
+ 
+diff -ru ../plib-1.8.5/src/fnt/Makefile.am ./src/fnt/Makefile.am
+--- ../plib-1.8.5/src/fnt/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/fnt/Makefile.am	2010-07-02 06:17:35.838107988 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_FNT
+ 
+-lib_LIBRARIES = libplibfnt.a
++lib_LTLIBRARIES = libplibfnt.la
+ 
+ include_HEADERS = fnt.h
+ 
+-libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
++libplibfnt_la_LDFLAGS = -version-info 9:5:8
++libplibfnt_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/js/Makefile.am ./src/js/Makefile.am
+--- ../plib-1.8.5/src/js/Makefile.am	2008-03-11 03:06:21.000000000 +0100
++++ ./src/js/Makefile.am	2010-07-02 06:12:40.559441988 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_JS
+ 
+-lib_LIBRARIES = libplibjs.a
++lib_LTLIBRARIES = libplibjs.la
+ 
+ include_HEADERS = js.h
+ 
+-libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
++libplibjs_la_LDFLAGS = -version-info 9:5:8
++libplibjs_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
+                              jsMacOSX.cxx jsWindows.cxx jsBSD.cxx   \
+                              jsNone.cxx
+ 
+diff -ru ../plib-1.8.5/src/Makefile.am ./src/Makefile.am
+--- ../plib-1.8.5/src/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/Makefile.am	2010-07-02 06:38:53.486390426 +0200
+@@ -1 +1 @@
+-SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw
++SUBDIRS = util js sl fnt pui sg ssg puAux ssgAux net psl pw
+diff -ru ../plib-1.8.5/src/net/Makefile.am ./src/net/Makefile.am
+--- ../plib-1.8.5/src/net/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/net/Makefile.am	2010-07-02 06:14:40.710350074 +0200
+@@ -1,11 +1,14 @@
+ if BUILD_NET
+ 
+-lib_LIBRARIES = libplibnet.a
++lib_LTLIBRARIES = libplibnet.la
+ 
+ include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
+ 	netMonitor.h netSocket.h net.h
+ 
+-libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
++libplibnet_la_LDFLAGS = -version-info 9:5:8
++libplibnet_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
+ 	netMessage.cxx netMonitor.cxx netSocket.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+diff -ru ../plib-1.8.5/src/psl/Makefile.am ./src/psl/Makefile.am
+--- ../plib-1.8.5/src/psl/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/psl/Makefile.am	2010-07-02 06:13:48.314158343 +0200
+@@ -1,11 +1,14 @@
+ 
+ if BUILD_PSL
+ 
+-lib_LIBRARIES = libplibpsl.a
++lib_LTLIBRARIES = libplibpsl.la
+ 
+ include_HEADERS = psl.h
+ 
+-libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
++libplibpsl_la_LDFLAGS = -version-info 9:5:8
++libplibpsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
+                        pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
+                        pslExpression.cxx pslProgram.cxx pslDump.cxx \
+                        pslError.cxx pslFileIO.cxx pslCompiler.h \
+diff -ru ../plib-1.8.5/src/puAux/Makefile.am ./src/puAux/Makefile.am
+--- ../plib-1.8.5/src/puAux/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/puAux/Makefile.am	2010-07-02 06:16:04.001410273 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_PUAUX
+ 
+-lib_LIBRARIES = libplibpuaux.a
++lib_LTLIBRARIES = libplibpuaux.la
+ 
+ include_HEADERS = puAux.h puAuxLocal.h
+ 
+-libplibpuaux_a_SOURCES = puAux.cxx                  \
++libplibpuaux_la_LDFLAGS = -version-info 9:5:8
++libplibpuaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la $(top_builddir)/src/pui/libplibpu.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibpuaux_la_SOURCES = puAux.cxx                  \
+                          puAuxBiSlider.cxx          \
+                          puAuxBiSliderWithEnds.cxx  \
+                          puAuxComboBox.cxx          \
+diff -ru ../plib-1.8.5/src/pui/Makefile.am ./src/pui/Makefile.am
+--- ../plib-1.8.5/src/pui/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/pui/Makefile.am	2010-07-02 06:14:25.110128517 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_PUI
+ 
+-lib_LIBRARIES = libplibpu.a
++lib_LTLIBRARIES = libplibpu.la
+ 
+ include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
+ 
+-libplibpu_a_SOURCES = \
++libplibpu_la_LDFLAGS = -version-info 9:5:8
++libplibpu_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la
++
++libplibpu_la_SOURCES = \
+         pu.cxx            puBox.cxx       puButton.cxx puButtonBox.cxx    \
+         puArrowButton.cxx puDialogBox.cxx puFrame.cxx  puGroup.cxx        \
+         puInput.cxx       puInterface.cxx puLocal.h    puMenuBar.cxx      \
+diff -ru ../plib-1.8.5/src/pw/Makefile.am ./src/pw/Makefile.am
+--- ../plib-1.8.5/src/pw/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/pw/Makefile.am	2010-07-02 05:27:45.487123738 +0200
+@@ -1,10 +1,11 @@
+ if BUILD_PW
+ 
+-lib_LIBRARIES = libplibpw.a
++lib_LTLIBRARIES = libplibpw.la
+ 
+ include_HEADERS = pw.h
+ 
+-libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
++libplibpw_la_LDFLAGS = -version-info 9:5:8
++libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/sg/Makefile.am ./src/sg/Makefile.am
+--- ../plib-1.8.5/src/sg/Makefile.am	2008-03-11 03:06:20.000000000 +0100
++++ ./src/sg/Makefile.am	2010-07-02 06:16:21.526342543 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_SG
+ 
+-lib_LIBRARIES = libplibsg.a
++lib_LTLIBRARIES = libplibsg.la
+ 
+ include_HEADERS = sg.h
+ 
+-libplibsg_a_SOURCES = sg.cxx sgd.cxx \
++libplibsg_la_LDFLAGS = -version-info 9:5:8
++libplibsg_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibsg_la_SOURCES = sg.cxx sgd.cxx \
+                       sgIsect.cxx sgdIsect.cxx \
+                       sgPerlinNoise.cxx
+ 
+diff -ru ../plib-1.8.5/src/sl/Makefile.am ./src/sl/Makefile.am
+--- ../plib-1.8.5/src/sl/Makefile.am	2008-03-11 03:06:24.000000000 +0100
++++ ./src/sl/Makefile.am	2010-07-02 06:12:48.165324370 +0200
+@@ -1,16 +1,20 @@
+ if BUILD_SL
+ 
+-lib_LIBRARIES = libplibsl.a libplibsm.a
++lib_LTLIBRARIES = libplibsl.la libplibsm.la
+ 
+ include_HEADERS = sl.h slPortability.h sm.h
+ 
+-libplibsl_a_SOURCES = \
++libplibsl_la_LDFLAGS = -version-info 9:5:8
++libplibsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
++
++libplibsl_la_SOURCES = \
+ 	slDSP.cxx slSample.cxx slEnvelope.cxx \
+ 	slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
+         slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
+         slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
+ 
+-libplibsm_a_SOURCES = slPortability.h smMixer.cxx
++libplibsm_la_LDFLAGS = -version-info 9:5:8
++libplibsm_la_SOURCES = slPortability.h smMixer.cxx
+ 
+ INCLUDES = -I$(top_srcdir)/src/util
+ 
+diff -ru ../plib-1.8.5/src/ssg/Makefile.am ./src/ssg/Makefile.am
+--- ../plib-1.8.5/src/ssg/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/ssg/Makefile.am	2010-07-02 06:13:29.638301515 +0200
+@@ -1,10 +1,13 @@
+ if BUILD_SSG
+ 
+-lib_LIBRARIES = libplibssg.a
++lib_LTLIBRARIES = libplibssg.la
+ 
+ include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
+ 
+-libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
++libplibssg_la_LDFLAGS = -version-info 9:5:8
++libplibssg_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
+ 	ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
+ 	ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
+ 	ssgLoadDOF.cxx ssgLoadAC.cxx \
+diff -ru ../plib-1.8.5/src/ssgAux/Makefile.am ./src/ssgAux/Makefile.am
+--- ../plib-1.8.5/src/ssgAux/Makefile.am	2008-03-11 03:06:21.000000000 +0100
++++ ./src/ssgAux/Makefile.am	2010-07-02 06:17:02.592635791 +0200
+@@ -1,6 +1,6 @@
+ if BUILD_SSGAUX
+ 
+-lib_LIBRARIES = libplibssgaux.a
++lib_LTLIBRARIES = libplibssgaux.la
+ 
+ include_HEADERS = ssgAux.h             \
+                   ssgaShapes.h         \
+@@ -13,7 +13,10 @@
+                   ssgaFire.h           \
+                   ssgaBillboards.h
+ 
+-libplibssgaux_a_SOURCES = ssgAux.cxx               \
++libplibssgaux_la_LDFLAGS = -version-info 9:5:8
++libplibssgaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/ssg/libplibssg.la $(top_builddir)/src/sg/libplibsg.la
++
++libplibssgaux_la_SOURCES = ssgAux.cxx               \
+                           ssgaShapes.cxx           \
+                           ssgaPatch.cxx            \
+                           ssgaParticleSystem.cxx   \
+diff -ru ../plib-1.8.5/src/util/Makefile.am ./src/util/Makefile.am
+--- ../plib-1.8.5/src/util/Makefile.am	2008-03-11 03:06:23.000000000 +0100
++++ ./src/util/Makefile.am	2010-07-02 05:34:06.711150524 +0200
+@@ -1,10 +1,11 @@
+ if BUILD_UL
+ 
+-lib_LIBRARIES = libplibul.a
++lib_LTLIBRARIES = libplibul.la
+ 
+ include_HEADERS = ul.h ulRTTI.h
+ 
+-libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
++libplibul_la_LDFLAGS = -version-info 9:5:8
++libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
+         ulList.cxx ulLocal.h ulRTTI.cxx
+ 
+ endif
diff --git a/media-libs/plib/plib-1.8.5-r3.ebuild b/media-libs/plib/plib-1.8.5-r3.ebuild
new file mode 100644
index 000000000000..21af7bffc8de
--- /dev/null
+++ b/media-libs/plib/plib-1.8.5-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools multilib-minimal
+
+DESCRIPTION="multimedia library used by many games"
+HOMEPAGE="http://plib.sourceforge.net/"
+SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="virtual/opengl"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared-libs.patch
+	"${FILESDIR}"/${P}-X11-r1.patch
+	"${FILESDIR}"/${P}-CVE-2011-4620.patch
+	"${FILESDIR}"/${P}-CVE-2012-4552.patch
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-shared
+	)
+	ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	DOCS=( AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO* )
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}