summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-08-05 13:57:29 +0000
committerSamuli Suominen <drac@gentoo.org>2007-08-05 13:57:29 +0000
commitee6a3b80f46204e7b7cead6b7c302a54429efb52 (patch)
treec7e7b04019b435e35792e69f3f55da043b734bdc /media-sound/bossogg
parentStable on ppc wrt bug 187558 (diff)
downloadgentoo-2-ee6a3b80f46204e7b7cead6b7c302a54429efb52.tar.gz
gentoo-2-ee6a3b80f46204e7b7cead6b7c302a54429efb52.tar.bz2
gentoo-2-ee6a3b80f46204e7b7cead6b7c302a54429efb52.zip
Multilib fix, this time for real. Thanks to Ken69267 for testing.
(Portage version: 2.1.3.3)
Diffstat (limited to 'media-sound/bossogg')
-rw-r--r--media-sound/bossogg/ChangeLog6
-rw-r--r--media-sound/bossogg/bossogg-0.13.6-r3.ebuild13
-rw-r--r--media-sound/bossogg/files/bossogg-0.13.6-multilib.patch14
3 files changed, 26 insertions, 7 deletions
diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index b6314a417d87..c4c39f1f079e 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/bossogg
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.27 2007/08/04 16:42:16 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.28 2007/08/05 13:57:28 drac Exp $
+
+ 05 Aug 2007; Samuli Suominen <drac@gentoo.org>
+ +files/bossogg-0.13.6-multilib.patch, bossogg-0.13.6-r3.ebuild:
+ Multilib fix, this time for real.
04 Aug 2007; Samuli Suominen <drac@gentoo.org> bossogg-0.13.6-r3.ebuild:
Multilib fix.
diff --git a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
index 80ed07956eea..6e62a8117e76 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.10 2007/08/04 16:42:16 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.11 2007/08/05 13:57:28 drac Exp $
inherit autotools eutils multilib
@@ -28,11 +28,12 @@ RDEPEND="${DEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/${P}-Makefile.patch"
- epatch "${FILESDIR}/${P}-gcc4.patch"
- epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
- epatch "${FILESDIR}/${P}-metadata.patch"
- epatch "${FILESDIR}/${P}-sigkill.patch"
+ epatch "${FILESDIR}"/${P}-Makefile.patch
+ epatch "${FILESDIR}"/${P}-gcc4.patch
+ epatch "${FILESDIR}"/${P}+flac-1.1.3.patch
+ epatch "${FILESDIR}"/${P}-metadata.patch
+ epatch "${FILESDIR}"/${P}-sigkill.patch
+ epatch "${FILESDIR}"/${P}-multilib.patch
eautoreconf
}
diff --git a/media-sound/bossogg/files/bossogg-0.13.6-multilib.patch b/media-sound/bossogg/files/bossogg-0.13.6-multilib.patch
new file mode 100644
index 000000000000..81d4442e4aea
--- /dev/null
+++ b/media-sound/bossogg/files/bossogg-0.13.6-multilib.patch
@@ -0,0 +1,14 @@
+diff -ur bossogg-0.13.6.orig/configure.in bossogg-0.13.6/configure.in
+--- bossogg-0.13.6.orig/configure.in 2004-04-02 13:42:50.000000000 +0300
++++ bossogg-0.13.6/configure.in 2007-08-05 16:49:44.000000000 +0300
+@@ -34,9 +34,7 @@
+ PYTHON_LIB_FLAGS=`python-config`
+ LIBS="$LIBS $PYTHON_LIB_FLAGS"
+ PYTHON_INCLUDE_FLAGS=`python -c "import os,sys; print '-I' + os.path.join(sys.prefix, 'include', 'python' + sys.version[[:3]])"`
+-if test $prefix = NONE; then
+- pythondir=`python -c "import os,sys; print os.path.join(sys.prefix, 'lib', 'python' + sys.version[[:3]], 'site-packages')"`
+-fi
++pythondir=`python -c 'from distutils.sysconfig import get_python_lib; import os; print os.path.normcase(os.path.realpath(get_python_lib()))'`
+ PYTHON_PREFIX=`python -c "import os,sys; print sys.prefix"`
+ PYTHON_EXEC_PREFIX=`python -c "import os,sys; print sys.exec_prefix"`
+ CFLAGS="$CFLAGS $PYTHON_INCLUDE_FLAGS"