old

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

5 files changed, 7 insertions, 141 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 03142c9ee01d..fcbbe94bcfe2 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.110 2012/10/20 18:48:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.111 2012/11/17 18:04:05 mr_bones_ Exp $
+
+  17 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/sdl-mixer-1.2.11-midi.patch, -files/sdl-mixer-1.2.11-multilib.patch,
+  -sdl-mixer-1.2.11-r1.ebuild:
+  old
 
   20 Oct 2012; Raúl Porcel <armin76@gentoo.org> sdl-mixer-1.2.12-r1.ebuild:
   ia64 stable wrt #436124
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 7a7a4c6a39ef..d8c7d2760393 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,19 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX sdl-mixer-1.2.11-midi.patch 779 SHA256 267535c82e1e97f4407b02cf7a21c98a1f89fdd431a8698cffa69afacdd44ef5 SHA512 382498f7d63f875dcf9a851c59789e80e55dc3bd214bdae65953e628ba524c6bfa40ca9fa8480c49048e2e6740ba57e22d42e080e2aac77e9a87ff7e92fd0b44 WHIRLPOOL fc40e061934e48ff6842848072105321c7bf01d0f0f41eed8139b886929f97e5c31e8ca0d78823d3bb7f22ad34c817304ecc7f69c5ec0e45dc7debd98f28a1a0
-AUX sdl-mixer-1.2.11-multilib.patch 1247 SHA256 76ab56747d29bdae932394f8e501ce22f470096268e0b8cc63ea4335c837976c SHA512 967177587ed3dffe9336e001af658aa049f7ee642a23ba68ca4ced8857766335ff33011bf4e055699562a4d9f3144578a5458045fa425ee7ba2026c139639710 WHIRLPOOL d4b27067012955a99bcc843e1125a8e1e93f56dcddb3e2487dd366e18f9c5ce2dbc437fbfe6ae9b6dba6af79c046f344422de5acd65d97e46e465b91bff08f90
 AUX sdl-mixer-1.2.12-wav.patch 796 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9 SHA512 9fed330d6bcae546752434a0ea29168e2a8fa432c8670d7290e70905f3431746b15126e5ce05820e4dd4dd09c982c880a6ce901ab9b3cff298e7f2c8d6a8b491 WHIRLPOOL 8b26551b494cdb6658538a4220c01d48f3996c2eb74f4a4e97b7b4f1aa4945d951e26d885911ef0cd2d7183befd5cace209e3f88469ab21d4981864c6ee2063c
-DIST SDL_mixer-1.2.11.tar.gz 2690654 SHA256 86145ac39cac6d2c6169c226f937648dca5e89dcd828751763dd174fa9af9cf9 SHA512 60fc881afe6ad3d7cf9b7b54ac0f916dee526c501f13ae6472029c78432e3f563a0c4e957e0dd8ee4ea8c427cf27fae2805ea6241ca8cb0a5706d6a9108080ce WHIRLPOOL 328da39841068b44b85d7d4ee3afb5733574e873bee974e15585be695c1c8d24035ee3ea596b95575d3d887719b84803ed135e91beaf45ecfb08a5926aad3e99
 DIST SDL_mixer-1.2.12.tar.gz 3707781 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SHA512 230f6c5a73f4bea364f8aa3d75f76694305571dea45f357def742b2b50849b2d896af71e08689981207edc99a9836088bee2d0bd98d92c7f4ca52b12b3d8cf96 WHIRLPOOL 046b7a160cfe214cdac8c1a5ea424024a8850d3737908e5630b504f1f12817bfd2f391909f37be3d6994cab7f71ab24ecab92e99f5429dd8405f0e4046bc00a7
-EBUILD sdl-mixer-1.2.11-r1.ebuild 1951 SHA256 7b43f2fb558ed816b37da24eb4d62346518ceb791a3eb67dee1c479631f68431 SHA512 41a979eed38a0aef0d4c839dff296cb10b7354f7ac0f1230c64e2a28960072f1aab8e381ec3ff8c64c75805d31b8179b639d8e6d610a60a80eca2169431e7fac WHIRLPOOL 99e5021fd6df2ddc293f32778bbc8ab0716084247131773849ab52f1ec7ddb939d5e25208e37dd4b5db3246323b0953024046f6536d821f35da6c7bd87c26fb2
 EBUILD sdl-mixer-1.2.12-r1.ebuild 2878 SHA256 7bc2f9790155808aec3623e10e697234ba9bb4346458334b018a6e10909f314b SHA512 1b4feef7c11c74af8ceca50914be97b386d40936baa2913e851507fd8d71c5efebc84bd439709af8715afdc4b998714ebfcd55f8fab8427656b8bd8a8bb2b32c WHIRLPOOL 9de71f8ac0e54aa1f290cab52e741bf09ad8f9f021c74e67e6d9b456603b1daf74a1aa580b0176bac18682858b98fba3e86e44961053bc20eaa75de8f20e8ac8
-MISC ChangeLog 14512 SHA256 59c4c1a8ee676d76539cfd715ec106330f330c2be460ae9eb94b61ca5cb6aa19 SHA512 29341ff03184df369647ed43335877b810ccb3b76a01e1f9dfda42abbd3ef3474bcfdaf37228e7e2d83719c33940a12c8363d2061bcb50ff1b503eebede9ed72 WHIRLPOOL 24d008a3416fe19be4f6ce615f38c297b146066e9ec9c3e2705a01b4d9323c4d2f8305c8294972c915ac1c92252b7707c4c67a6682957c56e8c35f80879e78ce
+MISC ChangeLog 14685 SHA256 e07b5d57eb4273d4f2eb40472bc0009907e573f42637f9eea5fc999a77138a13 SHA512 68e43463e6b27a7a3a9409c5cc1ac8a6f42967370500bcfc29e6f81e7a952b61c7fdf89f427cc2cc237b93879df394d9c23c570a74897c6270bc117bcad361de WHIRLPOOL 5989079115f68206c113aa20c4ed0012d267578d00971adee31b0e212ae2c6083f7362f1a78c4d428502e91c50897cf45e8ee2995a13e88eb919acf0647e1721
 MISC metadata.xml 572 SHA256 d4c6ae5e121255b47dd978176db7002fd8db1753cbfdf58792e9b4fa7565de35 SHA512 2b0cd28223fffbda314ad0f08415ca39b47b5734e105aea2f802b7ad22bee5aaa1c29c5583848de0605cbfde133901ac7bb1f61dd06c195ed731fc3a1847c656 WHIRLPOOL 50908664fc647d1c2d7c9d83cdb3bb4cb350ae38222dd15ad415bee3e5a85a7caa95ee65f79db44242bf7d94ff48ebe2354d21b1738cfc7a116eedaf4e32dc29
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlCC8gsACgkQuQc30/atMkC9cwCgia+1KBEbYJukI28NH+9Jtnzt
-IFgAn3kY29GyBbXasp3an5vTjs+dGVgu
-=H/L0
------END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-midi.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-midi.patch
deleted file mode 100644
index 5e45721b1aa8..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-midi.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-For bug 397333
-https://bugs.gentoo.org/show_bug.cgi?id=397333
-
-upstream patch pulled from:
-http://hg.libsdl.org/SDL_mixer/raw-diff/7a8f0018e23d/timidity/readmidi.c
-
---- a/timidity/readmidi.c
-+++ b/timidity/readmidi.c
-@@ -530,7 +530,7 @@
- {
-   MidiEventList *meep;
-   MidiEventList *next, *new;
--  int32 len;
-+  int32 len, next_pos, pos;
-   char tmp[4];
- 
-   meep=evlist;
-@@ -552,7 +552,7 @@
-       return -1;
-     }
-   len=BE_LONG(len);
--
-+  next_pos = SDL_RWtell(rw) + len;
-   if (memcmp(tmp, "MTrk", 4))
-     {
-       ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
-@@ -567,6 +567,9 @@
- 
-       if (new==MAGIC_EOT) /* End-of-track Hack. */
- 	{
-+          pos = SDL_RWtell(rw);
-+          if (pos < next_pos)
-+            SDL_RWseek(rw, next_pos - pos, RW_SEEK_CUR);
- 	  return 0;
- 	}
- 
-
-
-
-
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch
deleted file mode 100644
index 2e6d6d5ceb63..000000000000
--- a/media-libs/sdl-mixer/files/sdl-mixer-1.2.11-multilib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: 2011-07-28
-Subject: Fix linking to respect CFLAGS and LDFLAGS properly, fixing a
-	compilation bug (https://bugs.gentoo.org/376717) on
-	portage-multilib.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -72,13 +72,13 @@
- @PLAYMUS_DEPENDS@
- 
- $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS)
- 
- $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
- 
- $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
--	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
-+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
- 
- install: all install-hdrs install-lib #install-bin
- install-hdrs:
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild
deleted file mode 100644
index 3eae96aef50e..000000000000
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.11-r1.ebuild,v 1.10 2011/12/09 21:16:44 tupone Exp $
-
-EAPI=2
-inherit eutils
-
-MY_P=${P/sdl-/SDL_}
-DESCRIPTION="Simple Direct Media Layer Mixer Library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
-SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac mad +midi mikmod mp3 playtools static-libs timidity vorbis +wav"
-
-DEPEND=">=media-libs/libsdl-1.2.10
-	flac? ( media-libs/flac )
-	timidity? ( media-sound/timidity++ )
-	mad? ( media-libs/libmad )
-	!mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )
-	mikmod? ( >=media-libs/libmikmod-3.1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-multilib.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-music-mod-shared \
-		--disable-music-ogg-shared \
-		--disable-music-flac-shared \
-		--disable-music-mp3-shared \
-		$(use_enable wav music-wave) \
-		$(use_enable midi music-midi) \
-		$(use_enable timidity music-timidity-midi) \
-		$(use_enable mikmod music-mod) \
-		$(use_enable vorbis music-ogg) \
-		$(use_enable flac music-flac) \
-		$(use_enable static-libs static) \
-		$(use mad && echo --disable-music-mp3 || use_enable mp3 music-mp3) \
-		$(use_enable mad music-mp3-mad-gpl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use playtools; then
-		emake DESTDIR="${D}" install-bin || die "make install-bin failed"
-	fi
-	dodoc CHANGES README
-	if ! use static-libs ; then
-		find "${D}" -type f -name '*.la' -exec rm {} + \
-			|| die "la removal failed"
-	fi
-}