gentoo resync : 13.06.2020

3 files changed, 189 insertions, 4 deletions

diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 5d770344703f..2d770010f3fe 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,4 +1,5 @@
+AUX madplay-0.15.2b-fix-autoconf.patch 3680 BLAKE2B 43f6c7ea82daf816bd6df38f51c808efff962b62edafe8af59cf643632de8ed075ccde4c109368de75df0afa80eec5dd803f36d9ce36d99a519118c4fa0bf48e SHA512 232758235370d5280bd8ca8980edc503d92d0a18edceffff06a2683152b12b9a8fce3a8656284e6d58a91b251978b7a5f88d368452cdf4e9c2bcbbc73514e265
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 778 BLAKE2B ed4b1ef19681270f56f75587a46a8671bcdba50d14b469ccc29779a8177a00554bbc4b0f2f1f8c655d794869f0b869353bb68d59662f4baaa8138aed85dc0412 SHA512 9a2f67c7339975fefee524a872c9421be73ab7c98d63e1dc86dbf7cb4ad33feb13ec556fd0371497927037b96195ad9787318bd0fffa3e03a3c625e6d4ebc651
+EBUILD madplay-0.15.2b-r1.ebuild 778 BLAKE2B b5b26b0c18879c070d7e6b14caa135b93cda949c1fa635fcb851abdb2a61c69733c0f94f4655e810bbba4729eb52ed21e28193e08e36484216b915723298fb69 SHA512 fcf4d4c7ce5f03129b0316bc912c6885af63f49c9b8a967bcfcb49e8e764cf72db2e940ee6a2cef6cf1c694d2e8afc02d093d64a2b533bfc14773bd1f94d5f01
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
new file mode 100644
index 000000000000..92a5a8434e34
--- /dev/null
+++ b/media-sound/madplay/files/madplay-0.15.2b-fix-autoconf.patch
@@ -0,0 +1,182 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,28 +36,8 @@
+ 
+ dnl Checks for programs.
+ 
+-# Work-around for autoconf 2.53 bug
+-case "$host" in
+-    *-apple-darwin*)
+-	: ${CPP="cc -E -traditional-cpp"}
+-	;;
+-esac
+-
+ AC_PROG_CC
+ 
+-if test "$GCC" = yes
+-then
+-    case "$host" in
+-	*-*-mingw*)
+-	    case "$build" in
+-		*-*-cygwin*)
+-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
+-		    LDFLAGS="$LDFLAGS -mno-cygwin"
+-		    ;;
+-	    esac
+-    esac
+-fi
+-
+ dnl Support for libtool.
+ 
+ AC_DISABLE_SHARED
+@@ -67,77 +47,7 @@
+ 
+ dnl Compiler options.
+ 
+-arch=""
+-debug=""
+-optimize=""
+-profile=""
+-
+-set -- $CFLAGS
+-CFLAGS=""
+-
+-if test "$GCC" = yes
+-then
+-    CFLAGS="-Wall"
+-fi
+-
+-while test $# -gt 0
+-do
+-    case "$1" in
+-	-Wall)
+-	    if test "$GCC" = yes
+-	    then
+-		:
+-	    else
+-		CFLAGS="$CFLAGS $1"
+-	    fi
+-	    shift
+-	    ;;
+-	-g)
+-	    debug="-g"
+-	    shift
+-	    ;;
+-	-mno-cygwin)
+-	    shift
+-	    ;;
+-	-m*)
+-	    arch="$arch $1"
+-	    shift
+-	    ;;
+-	-fomit-frame-pointer)
+-	    shift
+-	    ;;
+-	-O*|-f*)
+-	    optimize="$1"
+-	    shift
+-	    ;;
+-	*)
+-	    CFLAGS="$CFLAGS $1"
+-	    shift
+-	    ;;
+-    esac
+-done
+-
+-if test "$GCC" = yes
+-then
+-    if test -z "$arch"
+-    then
+-	case "$host" in
+-	    i386-*)           ;;
+-	    i?86-*)           arch="-march=i486" ;;
+-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
+-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
+-	    powerpc-*)        ;;
+-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
+-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
+-	esac
+-    fi
+-
+-    if test -n "$optimize"
+-    then
+-	: #? optimize="$optimize -funroll-loops"
+-	: #? optimize="$optimize -finline-functions"
+-    fi
+-fi
++CFLAGS="${CFLAGS} -Wall"
+ 
+ dnl Internationalization support.
+ 
+@@ -445,71 +355,8 @@
+     depend_audio="$depend_audio audio_$audio.o"
+ fi
+ 
+-dnl madplay options...
+-
+-AC_MSG_CHECKING([whether to enable profiling])
+-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
+-			 [generate profiling code]),
+-[
+-    case "$enableval" in
+-	yes) profile="-pg" ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_profiling-no})
+-
+-AC_MSG_CHECKING([whether to enable debugging])
+-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
+-			 [enable diagnostic debugging support])
+-AC_HELP_STRING([--disable-debugging],
+-			 [do not enable debugging and use more optimization]),
+-[
+-    case "$enableval" in
+-	yes)
+-	    AC_DEFINE(DEBUG, 1,
+-		[Define to enable diagnostic debugging support.])
+-	    optimize=""
+-	    ;;
+-	no)
+-	    if test -n "$profile"
+-	    then
+-    AC_MSG_ERROR([--enable-profiling and --disable-debugging are incompatible])
+-	    fi
+-
+-	    AC_DEFINE(NDEBUG, 1,
+-		[Define to disable debugging assertions.])
+-	    debug=""
+-	    if test "$GCC" = yes
+-	    then
+-		optimize="$optimize -fomit-frame-pointer"
+-	    fi
+-	    ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_debugging-default})
+-
+-case "$enable_debugging" in
+-    yes) AC_CHECK_LIB(efence, malloc) ;;
+-esac
+-
+-AC_MSG_CHECKING([whether to enable experimental code])
+-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
+-			    [enable experimental code]),
+-[
+-    case "$enableval" in
+-	yes)
+-	    AC_DEFINE(EXPERIMENTAL, 1, [Define to enable experimental code.])
+-	    ;;
+-    esac
+-])
+-AC_MSG_RESULT(${enable_experimental-no})
+-
+ dnl Create output files.
+ 
+-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
+-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
+-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
+-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
+-
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+ 	intl/Makefile po/Makefile.in m4/Makefile  \
+ 	madplay.list])
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index c460ef1497d1..8b00f0ac9387 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa debug nls"
+IUSE="alsa nls"
 
 RDEPEND="
 	media-libs/libid3tag:=
@@ -21,7 +21,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-macos.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-macos.patch
+	"${FILESDIR}"/${P}-fix-autoconf.patch
+)
 
 src_prepare() {
 	default
@@ -31,7 +34,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable debug debugging) \
 		$(use_with alsa) \
 		--without-esd
 }