gentoo resync : 13.06.2020

4 files changed, 80 insertions, 1 deletions

diff --git a/media-libs/dumb/Manifest b/media-libs/dumb/Manifest
index c7abec47ff16..301b24a87307 100644
--- a/media-libs/dumb/Manifest
+++ b/media-libs/dumb/Manifest
@@ -1,5 +1,8 @@
 AUX dumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX dumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
+AUX dumb-2.0.3-pkg-config.patch 667 BLAKE2B 1607438fc49682500cdbeb4af8aa2eca5b4a8131505c932b2413404d691ee4a580f564be5290b7063849746babcfba94f7a9dccac9bbeb67c97a8ee68353f440 SHA512 bed13c5369ac951837f41b7bb10b86fa73c871a7ed3b7b9876a304f2ffd31635d4e45093e09cd62ba0b856f58b27ae15a508ad36c773ee7b96c3cf7d90a47660
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
+DIST dumb-2.0.3.tar.gz 186576 BLAKE2B 0bd2e512b88260e67b11856630aecfdda2f11a8c5f931c1da3451dbfc15cd5e7e38e718d12b99e0598d9522cf259317a98c5d3088dd979c487a8971fd562ee3f SHA512 18b10a507d69a754cdf97fbeae41c17f211a6ba1f166a822276bdb6769d3edc326919067a3f4d1247d6715d7a5a8276669d83b9427e7336c6d111593fb7e36cf
 EBUILD dumb-0.9.3-r3.ebuild 1946 BLAKE2B 9cf6f12f20dfafa9bea7bdd7d1075ea9b78a38ff4c3835f0b11f929da962b80f633a8dff3c924eab60de00f59fcc3feb0b7f5e966a42f8faa4849e001e37ea96 SHA512 7b53f9a0b2e4169672542b2acdfe5b348907d89d1789d12daf12997d2052ccd27bbd292523d5fb52a04ea1e15a1adf31184303a489b49bceaf76f097b96a0998
-MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
+EBUILD dumb-2.0.3.ebuild 996 BLAKE2B 7bd9136e66ff8a45d8b85e3a41b6bea19afeba36ef5ee9fc6146e0d957a1690c982156998101205feb05b6af6a196e24b019cec4f2565812fb231ae931376609 SHA512 8cca80a77c1ea2dbbc474a6bbd86c99ed5f1f5794e1a893b6b60258cefb58e19bca7fb6212d4ee3369a4b69d8f88e16ec4673527672d47137cd6012c626cb3b4
+MISC metadata.xml 449 BLAKE2B 559267d1804b59df90c5215e6a188c3140673a3727c092fdcce9dafc10b016e22d7a13abd0b174cff1c29b90e9778909e49df70ff84643045c71dcc730e883c8 SHA512 dfb5c4d19a6406fd6dec98b07ca901c22a1690137e308b27e4c64973ff2bcd2cb042ce5f1b062fc619e5739da7ecc67d50923baf527c0b9116e5a196351de543
diff --git a/media-libs/dumb/dumb-2.0.3.ebuild b/media-libs/dumb/dumb-2.0.3.ebuild
new file mode 100644
index 000000000000..7c509445721b
--- /dev/null
+++ b/media-libs/dumb/dumb-2.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Module/tracker based music format parser and player library"
+HOMEPAGE="https://github.com/kode54/dumb"
+SRC_URI="https://github.com/kode54/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="DUMB-0.9.3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="allegro cpu_flags_x86_sse examples"
+
+RDEPEND="
+	allegro? (
+		media-libs/allegro:0[${MULTILIB_USEDEP}]
+		!media-libs/aldumb
+	)
+	examples? (
+		>=dev-libs/argtable-2
+		media-libs/libsdl2[sound]
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pkg-config.patch
+)
+
+DOCS=(
+	CHANGELOG.md
+	DUMBFILE_SYSTEM.md
+	README.md
+	UPDATING_YOUR_PROJECTS.md
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALLEGRO4=$(usex allegro)
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DUSE_SSE=$(usex cpu_flags_x86_sse)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch b/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch
new file mode 100644
index 000000000000..5b8d9856e171
--- /dev/null
+++ b/media-libs/dumb/files/dumb-2.0.3-pkg-config.patch
@@ -0,0 +1,21 @@
+From 3a4f71afbc23d716d0d1f71664b94af143ae8e11 Mon Sep 17 00:00:00 2001
+From: Robert Colton <robertbcolton@gmail.com>
+Date: Tue, 18 Dec 2018 22:03:51 -0500
+Subject: [PATCH] fix pkg-config linking issue -llibdumb
+
+---
+ pkg-config.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg-config.pc.in b/pkg-config.pc.in
+index c11861c..92a9735 100644
+--- a/pkg-config.pc.in
++++ b/pkg-config.pc.in
+@@ -7,6 +7,6 @@ Name: DUMB
+ Description: DUMB is a module audio renderer library. 
+ Version: @DUMB_VERSION@
+ URL: https://github.com/kode54/dumb/
+-Libs: -L${libdir} -l@PROJECT_NAME@
++Libs: -L${libdir} -ldumb
+ Libs.private: -lm
+ Cflags: -I${includedir} 
diff --git a/media-libs/dumb/metadata.xml b/media-libs/dumb/metadata.xml
index 18f5db992196..66e3068bc83d 100644
--- a/media-libs/dumb/metadata.xml
+++ b/media-libs/dumb/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">kode54/dumb</remote-id>
 		<remote-id type="sourceforge">dumb</remote-id>
 	</upstream>
+	<use>
+		<flag name="allegro">Add support for Allegro 4</flag>
+	</use>
 </pkgmetadata>