amd64 stable wrt #307655

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/mac/ChangeLog b/media-sound/mac/ChangeLog
index 21bd53c4c0d88399a940fc4f2b7ad40624f4ecc8..44cf343445bf86ef6ef7467a1027d4ac3eeb225e 100644 (file)
--- a/media-sound/mac/ChangeLog
+++ b/media-sound/mac/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/mac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.11 2010/03/19 17:39:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.12 2010/04/22 09:54:13 ssuominen Exp $
+
+  22 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> mac-3.99.4.5.6.ebuild:
+  amd64 stable wrt #307655
 
   19 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   mac-3.99.4.5.6.ebuild:

diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index b9f3f638436bd6e6a8e709746d79caa6801e712d..5d15e127dcfde7bd18906843c0d1acec3756e3df 100644 (file)
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,8 +1,6 @@
 AUX mac-3.99.4.5-gcc44.patch 1515 RMD160 bfc5a73e42d16079c4e36c00a58769da4f5c9511 SHA1 667dd159b961f337a8782adf1642795f390cef2c SHA256 4a2951c5618b8777359baaa774530d2864b57b70a8494291cd52ccc874692fe5
 AUX mac-3.99.4.5.4-gcc44.patch 2588 RMD160 e5c9240dd41be3fce4dc2aad7813b27fe232c026 SHA1 a092a76a1c2dbb569d3755980fd1a06b6efc03b8 SHA256 cfec1481d0a5ccffb0f177fad662f1cff2298c88f3cc896c438187fe874545ef
-DIST mac-3.99-u4-b5-s4.tar.gz 427978 RMD160 986849a0f332e1d8f87f9954c34ecd90dbe4749c SHA1 fe706e1847b9c2f67f282c113d94305ac4e35bb2 SHA256 6270532925559bdc8dbc4ef4ca8befb5508c255a667e50382fc40b92a625544f
 DIST mac-3.99-u4-b5-s6.tar.gz 447599 RMD160 cadc90a756b53bf799e1f99daa283447de19d6ee SHA1 d4b86336e2b13cdaa4dbc4296d2e1f3d3396556b SHA256 5349f5a8ef60f88ddbba99711be183417ae931d7f5dd5e68e88271a7987b12b3
-EBUILD mac-3.99.4.5.4.ebuild 1379 RMD160 c6984a51103f4a13bd643a40cea547bde8833132 SHA1 0c80b5113e378a8f5ad6ce017248f0047ab9e75e SHA256 22446a8a3d4d4539f36755ac5bb18c858108ac55ece211c266e0a388824d1203
-EBUILD mac-3.99.4.5.6.ebuild 1300 RMD160 2ed6bbafa17938d5ebd5b254b013013a6f7d4ca1 SHA1 7c4a0b737de9595f85839bea015c652c1d746fad SHA256 55e210cf4cf965935120853fe095ad70ba95e822bf63014df6a2d075c4d98ef0
-MISC ChangeLog 1463 RMD160 724cd796c9c1e5c6caa4c15f0431b9be74d48a89 SHA1 d2a21c6c1f74da29a423c4b38a8bfb65b448ffe0 SHA256 e57ebf0d1409d35601f6dfdd36545792220a6fbe27857f1ae98077e9a3a57590
+EBUILD mac-3.99.4.5.6.ebuild 1298 RMD160 c8f993cd6e5b9d6294ddedb6e1303774205a0e8b SHA1 e51469eacbee3a7f299c8983f9074b0ab650ebef SHA256 cb1f7fadd56dd7671ffa2b76fc34a697e3cd4607d9cd179020bc87a2dd4de4de
+MISC ChangeLog 1567 RMD160 12ffb8a24c943a2614868f4d229eb54702a93d7c SHA1 c0dc9ed06fbcfe49361634e392c1b57e744e99c3 SHA256 3501f2ccfbb2d301f584d050580dcee2b02d987e2d0168215d1e14d6eaec137e
 MISC metadata.xml 262 RMD160 66f194dc5491587fb70a202b9d5a54b288d37d82 SHA1 0b7b430cd13524cb15f76c1cc5afbdb3b58d91d0 SHA256 71631c43ff95c55eed0c208ecd6ac838376db9c69993ad0040a2bf4874e08ba6

diff --git a/media-sound/mac/mac-3.99.4.5.4.ebuild b/media-sound/mac/mac-3.99.4.5.4.ebuild
deleted file mode 100644 (file)
index 9aa2838..0000000
--- a/media-sound/mac/mac-3.99.4.5.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.4.ebuild,v 1.4 2010/03/03 20:07:51 billie Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib versionator
-
-MY_PV=$(get_version_component_range 1-2)-u$(get_version_component_range 3)-b$(get_version_component_range 4)
-PATCH=s$(get_version_component_range 5)
-MY_P=${PN}-${MY_PV}-${PATCH}
-
-DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://etree.org/shnutils/shntool/"
-SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}/${PATCH}/${MY_P}.tar.gz"
-
-LICENSE="mac"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mmx"
-
-RDEPEND=""
-DEPEND="sys-apps/sed
-       mmx? ( dev-lang/yasm )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="mirror"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-gcc44.patch
-       sed -i -e 's:-O3::' configure || die
-}
-
-pkg_setup() {
-       append-cppflags -DSHNTOOL
-       use mmx && append-ldflags -Wl,-z,noexecstack
-}
-
-src_configure() {
-       local mmx=no
-       use mmx && mmx=yes
-
-       econf \
-               --disable-dependency-tracking \
-               --disable-static \
-               --enable-assembly=${mmx}
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS ChangeLog ChangeLog.shntool NEWS README TODO src/Credits.txt \
-               src/History.txt || die
-       dohtml src/Readme.htm || die
-       find "${D}"/usr/$(get_libdir) -name '*.la' -delete || die
-}

diff --git a/media-sound/mac/mac-3.99.4.5.6.ebuild b/media-sound/mac/mac-3.99.4.5.6.ebuild
index a5fb3b6b94b6a03911511c36fbd3389357bab289..a6f7c66bffc1295c58a0abd8a0f9e49e5355fead 100644 (file)
--- a/media-sound/mac/mac-3.99.4.5.6.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.6.ebuild,v 1.2 2010/03/19 17:39:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.6.ebuild,v 1.3 2010/04/22 09:54:13 ssuominen Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}-${P
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="mmx"
 
 RDEPEND=""