Added patch to fix executable stack on x86 as per bug #114984, provided by Kevin F. Quinn. Remove the -p1 trick, as now the m4 file uses -p0 that works as a charm.

Package-Manager: portage-2.0.53

4 files changed, 16 insertions, 13 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index e7da6906e0aa..ddb4008a6abb 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.78 2005/11/28 12:21:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.79 2005/12/09 16:06:34 flameeyes Exp $
+
+  09 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> flac-1.1.2-r4.ebuild:
+  Added patch to fix executable stack on x86 as per bug #114984, provided by
+  Kevin F. Quinn. Remove the -p1 trick, as now the m4 file uses -p0 that works
+  as a charm.
 
 *flac-1.1.2-r4 (28 Nov 2005)
 
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index cf4ebddb428e..27d1f6bba820 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28fb92af22a62fc02a7db934c4bcab28 ChangeLog 10855
+MD5 9b3214f736025666ad799f3e6bc42c85 ChangeLog 11101
 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63
 MD5 7070b10e66383782b73856e6dc37ba70 files/digest-flac-1.1.2-r3 128
-MD5 56e6ece9916c60a6cbc372bc6177e082 files/digest-flac-1.1.2-r4 128
+MD5 88bfa9a553566f88b8cda800ee9a3525 files/digest-flac-1.1.2-r4 128
 MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705
 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041
 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175
 MD5 fd56b1b8ffec55c61c135ead55df01e6 flac-1.1.1.ebuild 1650
 MD5 c80227bc963a5b36da2abd45cf12a518 flac-1.1.2-r3.ebuild 1770
-MD5 eff31071fae53fed4a82458af09000ca flac-1.1.2-r4.ebuild 1833
+MD5 b2d976c45c7a18a4ade159429b8f5396 flac-1.1.2-r4.ebuild 1734
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDkfn5gIKl8Uu19MoRAlNWAKCAxgTc9ljyRtCf5Z6q8na9wVVwdwCfXpgX
-FWTascwyDRcvDiSuq0rwa7Q=
-=uh2/
+iD8DBQFDmaugAiZjviIA2XgRAt8wAKDp7Duksi7ICp51vNiR06OTB/rD7QCfRAJ2
+wrrF9Qstg5frnzxylG8BH08=
+=zbvs
 -----END PGP SIGNATURE-----
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r4 b/media-libs/flac/files/digest-flac-1.1.2-r4
index 1a661936e079..c67baaaae156 100644
--- a/media-libs/flac/files/digest-flac-1.1.2-r4
+++ b/media-libs/flac/files/digest-flac-1.1.2-r4
@@ -1,2 +1,2 @@
 MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
-MD5 3bc4571a2fd8261e98921e43121b8e1a flac-patches-2.tar.bz2 4768
+MD5 97765c778dacdbd423587d070ab61bb5 flac-patches-3.tar.bz2 5210
diff --git a/media-libs/flac/flac-1.1.2-r4.ebuild b/media-libs/flac/flac-1.1.2-r4.ebuild
index 728398ad9f58..3bc7f4457fd6 100644
--- a/media-libs/flac/flac-1.1.2-r4.ebuild
+++ b/media-libs/flac/flac-1.1.2-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r4.ebuild,v 1.1 2005/11/28 12:21:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r4.ebuild,v 1.2 2005/12/09 16:06:34 flameeyes Exp $
 
 inherit libtool eutils flag-o-matic autotools
 
-PATCHLEVEL="2"
+PATCHLEVEL="3"
 DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
 HOMEPAGE="http://flac.sourceforge.net/"
 SRC_URI="mirror://sourceforge/flac/${P}.tar.gz
@@ -27,10 +27,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Have to force this or the m4 file is not applied correctly
 	EPATCH_SUFFIX="patch" \
-	EPATCH_OPTS="-p1 ${EPATCH_OPTS}" \
-		epatch "${WORKDIR}/patches"
+	epatch "${WORKDIR}/patches"
 	AT_M4DIR="m4" eautoreconf
 	elibtoolize
 }