gentoo resync : 24.02.2018

5 files changed, 58 insertions, 5 deletions

diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest
index 268015358011..771f8ca4d5f9 100644
--- a/media-libs/plib/Manifest
+++ b/media-libs/plib/Manifest
@@ -1,6 +1,8 @@
-AUX plib-1.8.5-CVE-2011-4552.patch 1322 BLAKE2B 384a50a970012b7dd41bcb0362ee88ee373a4cf77278eecda1b26b6c02f8971d92f85b974e9fccbf7ff10af13ff4e54af6d7377140010f9a3113c86a6018bf0c SHA512 a09462ecb085703aae7cd3b77954cc800410aa37a9616255cca2f21456e6d5dcf8ead3f684c98236deb1455c6a034dc8ec874bafdbab003f7a63517ea1f8350d
 AUX plib-1.8.5-CVE-2011-4620.patch 415 BLAKE2B a6a059765551313653b0eb8d060d88cd9a61df9f57456f97b37f610cb3253db3cfc9855e958077d1a2383f65a99c2edc43732fbda50ca18287fd34f00776d943 SHA512 c046cf65e80629f238aaba724f522c31b434f5c9687ea02b019846ce3469c6b074bd014f81a7a4e6b43db7b084f4dcd9d4c04b557dbc1b8b8ca00f2d782fdf1c
+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
 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d
-EBUILD plib-1.8.5-r1.ebuild 784 BLAKE2B b97515ca2c9cb3f697294da1ce1fa4b1eaf575d3569fed49fc06a4877c65023fa516b2fbf66a48fb886fefde13dbb376f2ee19156ac4f92d33d5d3481b4a4a0b SHA512 04e03566c8736c84bf5578468359685e15b1525897aa950046af0eae80f6d44d5f584eca17ad9e3145a3e368b9a9409c378ccfc5dd4ceb6429a30d1e9d87f0c3
+EBUILD plib-1.8.5-r1.ebuild 784 BLAKE2B c076d89a951c4a12e79a95a039cabebc128a8824992adeab05eea0457b34f5238a5018e42b682937b9840d1d54fdad2a4ac74cb57259b9f481d05c6fbca5d9f1 SHA512 d12bc81479679091acb1ecfc03b1e1493296f3d0a79698e48c03b5dc89510c7a7e9f51b7c5d02a699ccf69b9230875245136676f20dc003f5f3ff52c29ae0bc8
+EBUILD plib-1.8.5-r2.ebuild 836 BLAKE2B 3bc1d35150631439bd8066b6f519cfeeb7284294e3daa3d64ae3f4c394bbd9ef6554e3d251e150a8e359e5cfb1aed3b8c8f6ac79548e49ee9f85b0343c00658f SHA512 e856100351f8878e3dfbc424d871efe0c2f7efdeea1fe7b119f5d9d045ec6fdbaabb860491e5a90b5766cd038ebef3c6be329b419ea6b5bbf1ee52c3af81508d
 MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a
diff --git a/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch b/media-libs/plib/files/plib-1.8.5-CVE-2012-4552.patch
index 78f1b22ae129..78f1b22ae129 100644
--- a/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch
+++ b/media-libs/plib/files/plib-1.8.5-CVE-2012-4552.patch
diff --git a/media-libs/plib/files/plib-1.8.5-X11-r1.patch b/media-libs/plib/files/plib-1.8.5-X11-r1.patch
new file mode 100644
index 000000000000..7c19d15c370d
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.5-X11-r1.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -276,7 +276,7 @@
+ 
+         LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+-        LIBS="$LIBS $X_PRE_LIBS -lXi -lXmu -lXext -lX11 $X_EXTRA_LIBS -lm"
++        LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+ 
+ dnl =========================================================
+ dnl    if test "x$x_includes" != "x"; then
diff --git a/media-libs/plib/plib-1.8.5-r1.ebuild b/media-libs/plib/plib-1.8.5-r1.ebuild
index 28ae99f9830b..a0683b85a5f4 100644
--- a/media-libs/plib/plib-1.8.5-r1.ebuild
+++ b/media-libs/plib/plib-1.8.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,8 @@ RDEPEND=${DEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-X11.patch \
-		"${FILESDIR}"/${P}-CVE-2011-4552.patch \
-		"${FILESDIR}"/${P}-CVE-2011-4620.patch
+		"${FILESDIR}"/${P}-CVE-2011-4620.patch \
+		"${FILESDIR}"/${P}-CVE-2012-4552.patch
 
 	eautoreconf
 	# Since plib only provides static libraries, force
diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild
new file mode 100644
index 000000000000..d3ca9fa91384
--- /dev/null
+++ b/media-libs/plib/plib-1.8.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic autotools
+
+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}-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
+
+	# Since plib only provides static libraries, force
+	# building as PIC or plib is useless to amd64/etc...
+	append-flags -fPIC
+}
+
+src_install() {
+	DOCS=( AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO* )
+
+	default
+}