summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-11-20 16:20:10 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-11-20 16:24:57 +0100
commit1ab8a9812c16c8207df695c18ccbea517810730b (patch)
tree760c24c76dd183bb96a8cc85a409d13a46678d7e /media-libs/libmikmod
parentapp-admin/puppetserver: bup (diff)
downloadgentoo-1ab8a9812c16c8207df695c18ccbea517810730b.tar.gz
gentoo-1ab8a9812c16c8207df695c18ccbea517810730b.tar.bz2
gentoo-1ab8a9812c16c8207df695c18ccbea517810730b.zip
media-libs/libmikmod: remove old
Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'media-libs/libmikmod')
-rw-r--r--media-libs/libmikmod/Manifest3
-rw-r--r--media-libs/libmikmod/files/3.2.0/001_all_64bit.patch26
-rw-r--r--media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch13
-rw-r--r--media-libs/libmikmod/files/3.2.0/003_all_multilib.patch35
-rw-r--r--media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch22
-rw-r--r--media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch109
-rw-r--r--media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch12
-rw-r--r--media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch21
-rw-r--r--media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch15
-rw-r--r--media-libs/libmikmod/files/3.2.0/009_all_shell.patch17
-rw-r--r--media-libs/libmikmod/files/3.2.0/010_all_altivec.patch13
-rw-r--r--media-libs/libmikmod/libmikmod-3.2.0.ebuild63
-rw-r--r--media-libs/libmikmod/libmikmod-3.3.5.ebuild65
-rw-r--r--media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild69
14 files changed, 0 insertions, 483 deletions
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index fff1d968bacf..e418d547d477 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,4 +1 @@
-DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
-DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab WHIRLPOOL 30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e
-DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
diff --git a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch b/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
deleted file mode 100644
index 5aa45566c30c..000000000000
--- a/media-libs/libmikmod/files/3.2.0/001_all_64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-64bit.patch
-
---- include/mikmod.h.in
-+++ include/mikmod.h.in
-@@ -85,7 +85,8 @@ typedef char CHAR;
-
- @DOES_NOT_HAVE_SIGNED@
-
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
-
- typedef signed char SBYTE; /* 1 byte, signed */
---- include/mikmod_internals.h
-+++ include/mikmod_internals.h
-@@ -43,7 +43,8 @@ extern "C" {
- /*========== More type definitions */
-
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- typedef long SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch b/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
deleted file mode 100644
index beef6129f7af..000000000000
--- a/media-libs/libmikmod/files/3.2.0/002_all_strip-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-strip-lib.patch
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -51,7 +51,7 @@
-
- install: $(LIB)
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-- $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(LIB) $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(libdir)
-
- uninstall: $(LIB)
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIB)
diff --git a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch b/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
deleted file mode 100644
index be2483857fd4..000000000000
--- a/media-libs/libmikmod/files/3.2.0/003_all_multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-multilib.patch
-
---- libmikmod-config.in
-+++ libmikmod-config.in
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
-
- usage="\
--Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
-+Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]"
-
- if test $# -eq 0 ; then
- echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
- echo @LIB_LDADD@
- ;;
- --libs)
-+ if [ -d /usr/lib64 ]; then
-+ libdir=-L${exec_prefix}/lib64
-+ else
-+ libdir=-L${exec_prefix}/lib
-+ fi
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
-+ --libs32)
- libdir=-L${exec_prefix}/lib
- echo $libdir -lmikmod @LIBRARY_LIB@
- ;;
-+ --libs64)
-+ libdir=-L${exec_prefix}/lib64
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
- *)
- echo "${usage}" 1>&2
- exit 1
diff --git a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch b/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
deleted file mode 100644
index 9214df87d72e..000000000000
--- a/media-libs/libmikmod/files/3.2.0/004_all_malloc-fail.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/libmikmod.git/tree/libmikmod-malloc-fail.patch
-
-Some partially corrupt mod files cause mikmod to try and allocate lots
-of memory, this is ok, because failure to do so is being handled.
-
-But the new libmikmod malloc code align_pointer function did not handle
-asking to align the NULL pointer, resulting from the too big alloc,
-causing a segfault, this patch fixes this.
-
---- mmio/mmalloc.c
-+++ mmio/mmalloc.c
-@@ -38,6 +38,10 @@ static void * align_pointer(char *ptr, s
- {
- char *pptr = ptr + sizeof(void*);
- char *fptr;
-+
-+ if (ptr == NULL)
-+ return NULL;
-+
- size_t err = ((size_t)pptr)&(stride-1);
- if (err)
- fptr = pptr + (stride - err);
diff --git a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch b/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
deleted file mode 100644
index a49c50a56da6..000000000000
--- a/media-libs/libmikmod/files/3.2.0/005_all_CVE-2007-6720.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- playercode/mplayer.c
-+++ playercode/mplayer.c
-@@ -50,6 +50,8 @@ extern long int random(void);
- /* The currently playing module */
- MODULE *pf = NULL;
-
-+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define HIGH_OCTAVE 2 /* number of above-range octaves */
-
- static UWORD oldperiods[OCTAVE*2]={
-@@ -246,14 +248,14 @@ static int MP_FindEmptyChannel(MODULE *m
- MP_VOICE *a;
- ULONG t,k,tvol,pp;
-
-- for (t=0;t<md_sngchn;t++)
-+ for (t=0;t<NUMVOICES(mod);t++)
- if (((mod->voice[t].main.kick==KICK_ABSENT)||
- (mod->voice[t].main.kick==KICK_ENV))&&
- Voice_Stopped_internal(t))
- return t;
-
- tvol=0xffffffUL;t=-1;a=mod->voice;
-- for (k=0;k<md_sngchn;k++,a++) {
-+ for (k=0;k<NUMVOICES(mod);k++,a++) {
- /* allow us to take over a nonexisting sample */
- if (!a->main.s)
- return k;
-@@ -2247,12 +2249,12 @@ static void DoNNAEffects(MODULE *mod, MP
-
- switch (dat) {
- case 0x0: /* past note cut */
-- for (t=0;t<md_sngchn;t++)
-+ for (t=0;t<NUMVOICES(mod);t++)
- if (mod->voice[t].master==a)
- mod->voice[t].main.fadevol=0;
- break;
- case 0x1: /* past note off */
-- for (t=0;t<md_sngchn;t++)
-+ for (t=0;t<NUMVOICES(mod);t++)
- if (mod->voice[t].master==a) {
- mod->voice[t].main.keyoff|=KEY_OFF;
- if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2261,7 +2263,7 @@ static void DoNNAEffects(MODULE *mod, MP
- }
- break;
- case 0x2: /* past note fade */
-- for (t=0;t<md_sngchn;t++)
-+ for (t=0;t<NUMVOICES(mod);t++)
- if (mod->voice[t].master==a)
- mod->voice[t].main.keyoff|=KEY_FADE;
- break;
-@@ -2316,7 +2318,7 @@ void pt_UpdateVoices(MODULE *mod, int ma
- SAMPLE *s;
-
- mod->totalchn=mod->realchn=0;
-- for (channel=0;channel<pf->numchn;channel++) {
-+ for (channel=0;channel<NUMVOICES(mod);channel++) {
- aout=&mod->voice[channel];
- i=aout->main.i;
- s=aout->main.s;
-@@ -2737,7 +2739,7 @@ void pt_NNA(MODULE *mod)
- if (a->dct!=DCT_OFF) {
- int t;
-
-- for (t=0;t<md_sngchn;t++)
-+ for (t=0;t<NUMVOICES(mod);t++)
- if ((!Voice_Stopped_internal(t))&&
- (mod->voice[t].masterchn==channel)&&
- (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2979,6 +2981,11 @@ BOOL Player_Init(MODULE* mod)
- if (!(mod->voice=(MP_VOICE*)MikMod_calloc(md_sngchn,sizeof(MP_VOICE))))
- return 1;
-
-+ /* mod->numvoices was used during loading to clamp md_sngchn.
-+ After loading it's used to remember how big mod->voice is.
-+ */
-+ mod->numvoices = md_sngchn;
-+
- Player_Init_internal(mod);
- return 0;
- }
-@@ -3087,7 +3094,7 @@ MIKMODAPI void Player_NextPosition(void)
- pf->patbrk=0;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;t<pf->numchn;t++) {
-+ for (t=0;t<NUMVOICES(pf);t++) {
- Voice_Stop_internal(t);
- pf->voice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
-@@ -3112,7 +3119,7 @@ MIKMODAPI void Player_PrevPosition(void)
- pf->patbrk=0;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;t<pf->numchn;t++) {
-+ for (t=0;t<NUMVOICES(pf);t++) {
- Voice_Stop_internal(t);
- pf->voice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
-@@ -3139,7 +3146,7 @@ MIKMODAPI void Player_SetPosition(UWORD
- pf->sngpos=pos;
- pf->vbtick=pf->sngspd;
-
-- for (t=0;t<pf->numchn;t++) {
-+ for (t=0;t<NUMVOICES(pf);t++) {
- Voice_Stop_internal(t);
- pf->voice[t].main.i=NULL;
- pf->voice[t].main.s=NULL;
diff --git a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch b/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
deleted file mode 100644
index f70c35e0bfe8..000000000000
--- a/media-libs/libmikmod/files/3.2.0/006_all_CVE-2009-0179.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- loaders/load_xm.c
-+++ loaders/load_xm.c
-@@ -611,7 +611,8 @@ static BOOL LoadInstruments(void)
- nextwav[of.numsmp+u]=next;
- next+=s->length;
-
-- if(_mm_eof(modreader)) {
-+ /* last instrument is at the end of file in version 0x0104 */
-+ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- MikMod_free(nextwav);MikMod_free(wh);
- nextwav=NULL;wh=NULL;
- _mm_errno = MMERR_LOADING_SAMPLEINFO;
diff --git a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch b/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
deleted file mode 100644
index b70ede8a8126..000000000000
--- a/media-libs/libmikmod/files/3.2.0/007_all_loopingvolume-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Yi-Huang Han (24 Oct 2001)
- * Fixed MOD music volume when looping
-
-Samuli Suominen (17 Nov 2012)
- * Refresh the patch against libmikmod 3.2.0 release since it didn't make it upstream
- $ wget http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
- $ tar -vzxf SDL_mixer-1.2.12.tar.gz (or "tar xf" with GNU tar)
- $ unzip libmikmod-3.1.12.zip
- $ ls -l libmikmod-3.1.12-loopingvolume-fix.diff
-
---- playercode/mplayer.c
-+++ playercode/mplayer.c
-@@ -3013,7 +3013,7 @@
- {
- MUTEX_LOCK(vars);
- if (pf)
-- pf->volume=(volume<0)?0:(volume>128)?128:volume;
-+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
- MUTEX_UNLOCK(vars);
- }
-
diff --git a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch b/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
deleted file mode 100644
index e85ca13ea6ec..000000000000
--- a/media-libs/libmikmod/files/3.2.0/008_all_ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* Samuli Suominen (17 Nov 2012)
- Reviewed libmikmod-3.2.0_beta2-autotools.patch from gentoo-x86 and only this
- chunk didn't make it upstream
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -73,7 +73,7 @@
- rm -f Makefile
-
- $(LIB): $(OBJ)
-- $(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-
- dl_hpux.lo: $(top_srcdir)/dlapi/dl_hpux.c \
- $(top_srcdir)/dlapi/dlfcn.h
diff --git a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch b/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
deleted file mode 100644
index af4a2f6e0261..000000000000
--- a/media-libs/libmikmod/files/3.2.0/009_all_shell.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream didn't ship Makefile.am so we have to patch bits by hands.
-$(SHELL) is needed to run libtool properly (contains bashisms).
-LIBTOOL variable uses $(SHELL) in it's definition.
-
-Gentoo-bug: http://bugs.gentoo.org/401329
-Reported by: Anthony Parsons
-
---- libmikmod/Makefile.in
-+++ libmikmod/Makefile.in
-@@ -27,6 +27,7 @@ CC=@CC@
- INSTALL=@INSTALL@
- LIBTOOL=@LIBTOOL@
- MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
-+SHELL=@SHELL@
-
- DEFS=@DEFS@
- CFLAGS=@CFLAGS@ -Dunix
diff --git a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch b/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
deleted file mode 100644
index 5159634c0fc7..000000000000
--- a/media-libs/libmikmod/files/3.2.0/010_all_altivec.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=445556#c2
-
---- configure.in
-+++ configure.in
-@@ -724,7 +724,7 @@
- ;;
- Linux)
- dnl force_cpusubtype_ALL not allowed for Linux as
-- CFLAGS="$CFLAGS -faltivec"
-+ CFLAGS="$CFLAGS -maltivec"
- ;;
- esac
- fi
diff --git a/media-libs/libmikmod/libmikmod-3.2.0.ebuild b/media-libs/libmikmod/libmikmod-3.2.0.ebuild
deleted file mode 100644
index 7b78d6c1eae1..000000000000
--- a/media-libs/libmikmod/libmikmod-3.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.shlomifish.org/"
-SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa coreaudio oss static-libs"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
- !${CATEGORY}/${PN}:2"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-DOCS="AUTHORS NEWS README TODO"
-
-src_prepare() {
- EPATCH_SOURCE="${FILESDIR}"/${PVR} EPATCH_SUFFIX=patch epatch
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #468212
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable alsa) \
- --disable-nas \
- $(use_enable coreaudio osx) \
- $(use_enable oss) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dohtml docs/*.html
-
- prune_libtool_files
- dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-
- cat <<-EOF > "${T}"/${PN}.pc
- prefix=/usr
- exec_prefix=\${prefix}
- libdir=/usr/$(get_libdir)
- includedir=\${prefix}/include
- Name: ${PN}
- Description: ${DESCRIPTION}
- Version: ${PV}
- Libs: -L\${libdir} -lmikmod
- Libs.private: -ldl -lm
- Cflags: -I\${includedir} $("${ED}"/usr/bin/libmikmod-config --cflags)
- EOF
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${T}"/${PN}.pc
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.5.ebuild b/media-libs/libmikmod/libmikmod-3.3.5.ebuild
deleted file mode 100644
index 00ab6d4eb135..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa oss coreaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
- nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
- !${CATEGORY}/${PN}:2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-multilib_src_configure() {
- local mysimd="--disable-simd"
- if use ppc || use ppc64 || use ppc-macos; then
- mysimd="$(use_enable altivec simd)"
- fi
- if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
- mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
- fi
-
- # sdl, sdl2: missing multilib supported ebuilds, temporarily disabled
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable alsa) \
- $(use_enable nas) \
- $(use_enable pulseaudio) \
- --disable-sdl \
- --disable-sdl2 \
- $(use_enable openal) \
- $(use_enable oss) \
- $(use_enable coreaudio osx) \
- $(use_enable debug) \
- $(use_enable threads) \
- $(use_enable static-libs static) \
- --disable-dl \
- ${mysimd}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README TODO
- dohtml docs/*.html
- prune_libtool_files
-}
diff --git a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild b/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
deleted file mode 100644
index 44bdc9e9c483..000000000000
--- a/media-libs/libmikmod/libmikmod-3.3.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio cpu_flags_x86_sse2 static-libs +threads"
-
-REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
- nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
- !${CATEGORY}/${PN}:2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/libmikmod-config
-)
-
-multilib_src_configure() {
- local mysimd="--disable-simd"
- if use ppc || use ppc64 || use ppc-macos; then
- mysimd="$(use_enable altivec simd)"
- fi
- if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
- mysimd="$(use_enable cpu_flags_x86_sse2 simd)"
- fi
-
- # sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable alsa) \
- $(use_enable nas) \
- $(use_enable pulseaudio) \
- --disable-sdl \
- --disable-sdl2 \
- $(use_enable openal) \
- $(use_enable oss) \
- $(use_enable coreaudio osx) \
- $(use_enable debug) \
- $(use_enable threads) \
- $(use_enable static-libs static) \
- --disable-dl \
- ${mysimd}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
- dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README TODO
- dohtml docs/*.html
- prune_libtool_files
-}