From f3b17e517082e3c6581428440a122f1a2679e278 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Jul 2018 19:06:58 +0100
Subject: gentoo resync : 21.07.2018

---
 media-libs/aldumb/Manifest            |  2 +-
 media-libs/aldumb/aldumb-0.9.3.ebuild | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'media-libs/aldumb')

diff --git a/media-libs/aldumb/Manifest b/media-libs/aldumb/Manifest
index e155c485453f..a125b999d073 100644
--- a/media-libs/aldumb/Manifest
+++ b/media-libs/aldumb/Manifest
@@ -1,5 +1,5 @@
 AUX aldumb-0.9.3-PIC-as-needed.patch 2730 BLAKE2B c5d26002613ef712952c0aa3eeb376e9eb96c2943e7a5c09f9afeade7f65390a737faf4f3af49e11080a4bf64ecd643f0084e86b8ac9233f16796a408a448efd SHA512 b97bfdedfe4f64cc37ca52e50d0ac919747dd523f686350d8681a7629508f83ae87220622f9d431132aeb149dc6011e1461ac560ccece20a4dfb6a7d2ec9d962
 AUX aldumb-0.9.3_CVE-2006-3668.patch 637 BLAKE2B 876d7cf59b78c5f94320b08395ab64eaf71d5a97edc082f1ea73afec25e9a9bd8fba20b87df44ff936ea0ee31387dc818ab8e5ae040ff1517ed86cc6da8346e4 SHA512 ecce27757b27d997fffcc8b5736c1921a947664e2a73a4fc9ff269d8d24524fe3823a9076a3270b4296d6294102c0c7f5d2fc5c05152878dcaa11d6acede2125
 DIST dumb-0.9.3.tar.gz 167379 BLAKE2B 1a9f62b784f8e8ba5b30b892bc9588bbebca7d5270b5d1161230c1c538d1aed8c6d2f2afa6a9087858ad45dccee9c640498548a845b2f046a0c390e7a84525cc SHA512 9ecdea460858b7e6ad7ca2534ecb3581397e6c1fa904459affe19ce49f528e580e143b42b13413b292ae7b57901a8008e6a9ee3821824f6ff7914b136f75c658
-EBUILD aldumb-0.9.3.ebuild 1030 BLAKE2B d661b75d5aeb19a268e8bf234a9981b527f6a294c39e3d4c6cea0956198d2699df8f747b892015abadc2fbe25d726d1e25a5e31ee5b19289df7ffac206aa9abf SHA512 e5afa5a8c2a3d33918b3717ac757ceb32f4bf7c0617dbd8a1a2f4bb1dc077887b784a12f0a93d9f8bf8ef78f4ad65d1c5d95be084ddc57998d0284649a1ea6b6
+EBUILD aldumb-0.9.3.ebuild 1010 BLAKE2B 5c2892f92aba567dc5e2639057becdf85d83e63cd5ca29b7453ee7130440799e7d0e9b5bc29ff0ebeab745d04c4c97b38d0049e165266b367cc1e7dd8d436c40 SHA512 8de4573d5172345316e41c460320bb1a34ed2611293122c8f6d847bfe81e4d7dcff968c58bab14e2951239796b90b04ca0d6001335b15e16f1e3ef346ccc6cf9
 MISC metadata.xml 327 BLAKE2B fcd9433fc71614181970b679dfd2a3bb386b0d89199a2528c48d8c73d84490be56a5ec05a71eb629c82acd216361e0813b90f311ad1d311ab991355851dfff5c SHA512 e82c8c18d0744758b19a533b606aee382cdf2cbc36f431c3ed286704d75b759e663f2c3aaa2259c7a62352f4d73587ad34aff26a47ae06e20ab7372aa5a8c82c
diff --git a/media-libs/aldumb/aldumb-0.9.3.ebuild b/media-libs/aldumb/aldumb-0.9.3.ebuild
index b6fd72d59ff7..38c75c096e86 100644
--- a/media-libs/aldumb/aldumb-0.9.3.ebuild
+++ b/media-libs/aldumb/aldumb-0.9.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Allegro support for DUMB (an IT, XM, S3M, and MOD player library)"
 HOMEPAGE="http://dumb.sourceforge.net/"
@@ -13,27 +12,33 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=media-libs/dumb-0.9.3
-	<media-libs/allegro-5"
-
+DEPEND="
+	>=media-libs/dumb-0.9.3
+	media-libs/allegro:0
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P/aldumb/dumb}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-PIC-as-needed.patch
+	"${FILESDIR}"/${P}_CVE-2006-3668.patch
+)
+
 src_prepare() {
+	default
+
 	cat << EOF > make/config.txt
 include make/unix.inc
 ALL_TARGETS := allegro allegro-examples allegro-headers
 PREFIX := /usr
 EOF
-	epatch "${FILESDIR}"/${P}-PIC-as-needed.patch
-	epatch "${FILESDIR}"/${P}_CVE-2006-3668.patch
 	sed -i '/= -s/d' Makefile || die "sed failed"
-	cp -f Makefile Makefile.rdy
+	cp -f Makefile Makefile.rdy || die
 }
 
 src_compile() {
-	emake OFLAGS="${CFLAGS}" all || die "emake failed"
+	emake OFLAGS="${CFLAGS}" all
 }
 
 src_install() {
-- 
cgit v1.2.3