Update sed line (fixes bug #380489) and use D instead of ED.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/media-libs/libsoundtouch/ChangeLog b/media-libs/libsoundtouch/ChangeLog
index 2ca7d83c8a89a576c1e53df6615b28fd696d4bad..dd1031bf6e9a5c922e5b0d63106faab259dbe4c8 100644 (file)
--- a/media-libs/libsoundtouch/ChangeLog
+++ b/media-libs/libsoundtouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsoundtouch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.44 2011/10/20 15:54:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/ChangeLog,v 1.45 2011/10/25 22:20:33 radhermit Exp $
+
+  25 Oct 2011; Tim Harder <radhermit@gentoo.org> libsoundtouch-1.6.0.ebuild:
+  Update sed line (fixes bug #380489) and use D instead of ED.
 
   20 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   libsoundtouch-1.6.0.ebuild:

diff --git a/media-libs/libsoundtouch/Manifest b/media-libs/libsoundtouch/Manifest
index 8e3a7b950b29b1cbd371342fc317121a2e1cb915..235e19766fa72d1886c6d0608a8da9d07a492c44 100644 (file)
--- a/media-libs/libsoundtouch/Manifest
+++ b/media-libs/libsoundtouch/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX libsoundtouch-1.5.0-flags_and_version.patch 1693 RMD160 8a456e9901d875b1242abf08b40b9b0bf0714964 SHA1 7a7f6c920bdca4f31dead935f31b3073d9a8f4c3 SHA256 d82f1f7313f007291f9d12a82d3880de9594bf9c9ba11453bcaa4e6cdedf3ab7
 AUX libsoundtouch-1.6.0-flags.patch 798 RMD160 73393362f0a437339b2ea68b5a4fa7fb9c3e43af SHA1 e77f1a1abbbb31a25f56f075f8e512f9c1d80bc3 SHA256 130813eadcbb4fea03bcdd1e697bbb1c05111f1ca58aa034997d6f4d2422e7d3
 DIST soundtouch-1.5.0.tar.gz 283273 RMD160 da95a81bd34d2808a9bd771c442ca4cfdf7de3c6 SHA1 c3e73419acec242a49a408b78c55883def937fc0 SHA256 a1465b327f513ab3f75fbf5eba039a21568eebcf0dc18ce2809f874b5a79b1af
 DIST soundtouch-1.6.0.tar.gz 94852 RMD160 6d05dac27d163f46b632f06db4b52d83cf123158 SHA1 9871dcbf75a68665a3515bb9dda4727beb0358e7 SHA256 8776edaf7299ffe1e8c97285f020365a63c0e01aa4f6f7c5fd1d011c0ded278f
 EBUILD libsoundtouch-1.5.0.ebuild 1280 RMD160 08e28d3ee3b39adff62395e500037c216a313ca6 SHA1 17f98ea8b8f80419bfab55ec5181c7ffdc29fc2e SHA256 a9b792d33bfe9655f4eb536fc85d902f615d2981ca86beebc9274c8afb6953b7
-EBUILD libsoundtouch-1.6.0.ebuild 1203 RMD160 f7ad650b2b135a71b02dc16869bc5ea5ffcf957b SHA1 6f770469b9e3a49f67bfcaee7f46177f7efba1d8 SHA256 6c40cf49e45b024b92d58d115e60d35304b16668d74e8355c72394668b529678
-MISC ChangeLog 6293 RMD160 857fa49d14685b5702435c03b8d709249f3df042 SHA1 46c9a76325ae384d4cde83a562b04bda49463843 SHA256 03b20a350c245770d634f87655792d9e9df6c506babba7e47f7a91a95ec08da5
+EBUILD libsoundtouch-1.6.0.ebuild 1207 RMD160 e95bc2435d9551914a8af4a82152f72ca8a9af49 SHA1 4ef7451d381ccf773ce24ea706942cc9f95b8cb9 SHA256 a1df0a78ac823a14a8e8dca6044a47b906ed0d9358556f04ae15dd700eb64236
+MISC ChangeLog 6434 RMD160 465551328b333047da6049a7ad371e6b1928e3dd SHA1 281d14a9620b847a020e7140eb91504dbe0ac148 SHA256 958e43ec72c9af2626d90d173d015fad27df2bc5fed5778216d9ec3c2b3ce15a
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOoEQtAAoJEEdUh39IaPFNsgUIAIrSG/OjMfHPzRInW8tdamfR
-VAWG1ebJazng2njuBhckj8BmYp2h0BW0WOmojIT+tvvMv/SdnLAGA6c4xYl2FT6B
-gzYTcTxEHYtDlLDLuFxqMbq8JBQFJ0+/Ow6LTQkxqWWIFdgIO93R71FSTrGzrLe3
-ae/V7m5ZAA66fzJx02ZFQjDslaFtSQZkfX3JJ9rzwODlFwPDzMv2voontp9IiOnD
-A4eR17lQvMJ4FDHRsvenrGftje1PttorTRkskdQRpTLDsCPiiSm00EsDlfUTNlHn
-oVrjT5t7MCcbv6wPCacrb2bBpOH2rbypbJ/NSDKhPVCv9SkUSyFZnnzLl41Iig8=
-=Tc3j
+iQEcBAEBCgAGBQJOpzY6AAoJEEqz6FtPBkyjRQsIAJwT6eAptI4rWyyHYPCIcDaj
+sukd5TFPqH+a+FA0WSDbr99CuxOHVS0OtoRRBrlLfzGu32dTEKi35iVGxCNp9mRc
+0CcJJBOg6Ge/t9qXERVcehLQNZ3/NBw1ucIa4RyQqYJKN2/hyyYDLG1nQQhETKgb
+fWHXVwdCYH21/pWqhDtO6/e592Psb52+FDNN59NgqcmVgJzgY/M1KGXvzo1V4hHr
+Vz0TiMraHm4hCjua2iEUk9gKF5Jhx6vPvP9NPOtGW9VgClg0JzWdU8yKapum2UIz
+FQcX9VaiQXDA/XYaoWedHARPKo9RmmSBLvup5nb2U7mbEzqyWHC0lF1/uRM0AtA=
+=+G+i
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild b/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild
index 246a75e9e18d11cadeeaa1baf701011636c1eed3..ed2338fdaf15307fa8a1674eff9b45399d431fd1 100644 (file)
--- a/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild
+++ b/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo FoundationOU
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild,v 1.3 2011/10/20 15:54:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsoundtouch/libsoundtouch-1.6.0.ebuild,v 1.4 2011/10/25 22:20:33 radhermit Exp $
 
 EAPI=4
 inherit autotools-utils eutils flag-o-matic
@@ -26,7 +26,7 @@ src_prepare() {
        if use sse2; then
                append-flags -msse2
        else
-               sed -i -e '/^.*#define ALLOW_X86_OPTIMIZATIONS.*$/d' \
+               sed -i -e '/#define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS/d' \
                        include/STTypes.h || die
        fi
 }
@@ -43,6 +43,6 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR="${ED}" pkgdocdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+       emake DESTDIR="${D}" pkgdocdir="${EPREFIX}/usr/share/doc/${PF}/html" install
        remove_libtool_files all
 }