summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-10-27 19:36:52 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-10-27 19:36:52 +0000
commitff0accf66c548c42009899ebf6dc16d65ea282bf (patch)
tree1d3d9f221c5fa37473a41949a58fee9e021c2bd3 /media-libs/libsdl
parentVersion bump, addition of support for eselect-whois. (diff)
downloadhistorical-ff0accf66c548c42009899ebf6dc16d65ea282bf.tar.gz
historical-ff0accf66c548c42009899ebf6dc16d65ea282bf.tar.bz2
historical-ff0accf66c548c42009899ebf6dc16d65ea282bf.zip
Fixing segfault. Bug #151991 and removing ppc-macos keyword
Package-Manager: portage-2.1.1
Diffstat (limited to 'media-libs/libsdl')
-rw-r--r--media-libs/libsdl/ChangeLog9
-rw-r--r--media-libs/libsdl/Manifest41
-rw-r--r--media-libs/libsdl/files/digest-libsdl-1.2.116
-rw-r--r--media-libs/libsdl/files/digest-libsdl-1.2.11-r13
-rw-r--r--media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch11
-rw-r--r--media-libs/libsdl/libsdl-1.2.11-r1.ebuild168
-rw-r--r--media-libs/libsdl/libsdl-1.2.11.ebuild4
7 files changed, 221 insertions, 21 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 42501c0ad28d..96a3747f5802 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/libsdl
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.117 2006/10/03 20:07:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.118 2006/10/27 19:36:52 tupone Exp $
+
+*libsdl-1.2.11-r1 (27 Oct 2006)
+
+ 27 Oct 2006; <tupone@gentoo.org> +files/libsdl-1.2.11-audioConv.patch,
+ libsdl-1.2.11.ebuild, +libsdl-1.2.11-r1.ebuild:
+ Fixing segfault. Bug #151991 by me.
+ Removing ppc-macos keyword: no modular-X there
03 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> libsdl-1.2.11.ebuild:
Stable on Alpha.
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index f08170edd3ea..b011554c86ad 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -57,6 +57,10 @@ AUX libsdl-1.2.10-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb
MD5 2d9bced29ca7e5c69410ce1e3ff58e09 files/libsdl-1.2.10-sdl-config.patch 780
RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 files/libsdl-1.2.10-sdl-config.patch 780
SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015 files/libsdl-1.2.10-sdl-config.patch 780
+AUX libsdl-1.2.11-audioConv.patch 454 RMD160 fb1f3abec8e086dee3190dcbd481f182c6a6e6cf SHA1 779843e72e14b002c22d01ac23104bef01741278 SHA256 a033c55d3ad9cf14eade97c190d5ab9c5225258267162dac4e4536d83796fb45
+MD5 b4621a8edba64a4baa38c37a4251891b files/libsdl-1.2.11-audioConv.patch 454
+RMD160 fb1f3abec8e086dee3190dcbd481f182c6a6e6cf files/libsdl-1.2.11-audioConv.patch 454
+SHA256 a033c55d3ad9cf14eade97c190d5ab9c5225258267162dac4e4536d83796fb45 files/libsdl-1.2.11-audioConv.patch 454
AUX libsdl-1.2.11-libcaca-new-api.patch 18314 RMD160 5b7d739492294e1053453e20293e2c9c7bdde195 SHA1 ce4a7d301b5a4c3b8b57056b8f7c4c5528dcf019 SHA256 93ca84b1fffd696053942d110ef1092c002c71762bbdffe0af8c22c0576c6402
MD5 4f06a4e42f9153d678a8da4cdffd5c7f files/libsdl-1.2.11-libcaca-new-api.patch 18314
RMD160 5b7d739492294e1053453e20293e2c9c7bdde195 files/libsdl-1.2.11-libcaca-new-api.patch 18314
@@ -141,14 +145,18 @@ AUX libsdl-1.2.9-sdl-blit-mmx-check.patch 551 RMD160 18eb2d7b0b6fef9e0c47f4917fd
MD5 7335dd719002ab81477446278b2f786f files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
RMD160 18eb2d7b0b6fef9e0c47f4917fdb31faf37a0021 files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
SHA256 2dc359619d9af0cd418577b364c3395d9e3093fcfdd0195e9a0ebe62df3e4aaf files/libsdl-1.2.9-sdl-blit-mmx-check.patch 551
-DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SHA1 2259134d714e35ab1469d513674a3cd02510d198 SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
+DIST SDL-1.2.11.tar.gz 2796143 RMD160 1ea73d45dcecde9df8e4b5c18e7cbcaedb1e4c59 SHA1 6f9ef73c9b5705a5ddd5dd367423bc9c7cebc959 SHA256 c3f0e9b016368601697495dcdaed010ab0ee4b541d0052910f829ce318d90a2b
DIST SDL-1.2.7.tar.gz 2470936 RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SHA1 1a840c50668f230df9e9163ef1a282d9f3355383 SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
DIST SDL-1.2.8.tar.gz 2602449 RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SHA1 26f2104a60a28914b809d3cb77d5790bfdfd024c SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a
DIST SDL-1.2.9.tar.gz 2688179 RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SHA1 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1 SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-EBUILD libsdl-1.2.11.ebuild 4760 RMD160 51459dc47ec519d64726985333801269207c415c SHA1 ea8fd828d6e2c0d779c897988c0eb1a388b11502 SHA256 287f94c4fbcc495762f42c9b18affb2f9a446266072f8a361c4b8965efd8f14e
-MD5 eb89374a9cd978aec1ff58eb917a2a95 libsdl-1.2.11.ebuild 4760
-RMD160 51459dc47ec519d64726985333801269207c415c libsdl-1.2.11.ebuild 4760
-SHA256 287f94c4fbcc495762f42c9b18affb2f9a446266072f8a361c4b8965efd8f14e libsdl-1.2.11.ebuild 4760
+EBUILD libsdl-1.2.11-r1.ebuild 4858 RMD160 d3984d9ca9f3f4c2620c953fdc2be05a04be7dcf SHA1 6216664446466ab6c975ea8a96c52207dda6c34f SHA256 51205e3f0405e9e2eda0f9201c68178081069b50e4616720c4dcbfb1df1ac073
+MD5 8b6d6c52417e0dbc7f37556e294fcbc1 libsdl-1.2.11-r1.ebuild 4858
+RMD160 d3984d9ca9f3f4c2620c953fdc2be05a04be7dcf libsdl-1.2.11-r1.ebuild 4858
+SHA256 51205e3f0405e9e2eda0f9201c68178081069b50e4616720c4dcbfb1df1ac073 libsdl-1.2.11-r1.ebuild 4858
+EBUILD libsdl-1.2.11.ebuild 4750 RMD160 397755f624dbb6c0bde4217f365de711628f0faf SHA1 3fd1d5a46117e4e0686a7e3a8df5500858fe9111 SHA256 69a3d3bcb6d310fff3f97a99583adaec971793ea0f998476f641f36bcd4a395a
+MD5 95ddf7eb9e0057935bdb3d9d972fa920 libsdl-1.2.11.ebuild 4750
+RMD160 397755f624dbb6c0bde4217f365de711628f0faf libsdl-1.2.11.ebuild 4750
+SHA256 69a3d3bcb6d310fff3f97a99583adaec971793ea0f998476f641f36bcd4a395a libsdl-1.2.11.ebuild 4750
EBUILD libsdl-1.2.7-r3.ebuild 4269 RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e SHA1 61c2d2c90e4e31551fac4c557823b4b25016a557 SHA256 1eb38d7e30a20096b1480a62a6a759a436fa4b40688dbd2ca86da0e434a1fc05
MD5 5c56de3cfb83340e0d889828dd372194 libsdl-1.2.7-r3.ebuild 4269
RMD160 78ca7654af8eca755e73c58b1c5d6d6b6998612e libsdl-1.2.7-r3.ebuild 4269
@@ -165,17 +173,20 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c
MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643
RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643
SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643
-MISC ChangeLog 18374 RMD160 432b55607c65c7e8a90bf8ed44dd5cb3d1b3c25a SHA1 b5139d11b9ef87a0b5aa0fe9bb0cb8529f56e034 SHA256 3458f106824f0f631b2de6ebc86810abbe93b6027aeb4d0f1bca6b4c59236a18
-MD5 f56db0b07c2d74b9c870bfe236c0d26d ChangeLog 18374
-RMD160 432b55607c65c7e8a90bf8ed44dd5cb3d1b3c25a ChangeLog 18374
-SHA256 3458f106824f0f631b2de6ebc86810abbe93b6027aeb4d0f1bca6b4c59236a18 ChangeLog 18374
+MISC ChangeLog 18618 RMD160 ebe5b63f2d90dd2807521e7b97847a32fa4e0cba SHA1 f04871ac1e00c8290b8ec5f20d561b8a6684ae09 SHA256 43673c6e9978385e506500c9dce7ebcc70391ee8faa5b3f0d2a4f7f5151bbe9c
+MD5 ed47527af8e0af4cb2e02e6c4364bf4b ChangeLog 18618
+RMD160 ebe5b63f2d90dd2807521e7b97847a32fa4e0cba ChangeLog 18618
+SHA256 43673c6e9978385e506500c9dce7ebcc70391ee8faa5b3f0d2a4f7f5151bbe9c ChangeLog 18618
MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b metadata.xml 974
-MD5 9ed8388b30dd3fb3d16a0ae5bd5ce94e files/digest-libsdl-1.2.11 235
-RMD160 71eb2fb51f72febbc870a867d83d3cac7aefe7df files/digest-libsdl-1.2.11 235
-SHA256 be7333b21a407831ab4861ba67e56d36c9759b78f3b42400981abf3e34f5fda8 files/digest-libsdl-1.2.11 235
+MD5 1d23ceea95bcb434636db5c8bb2719b9 files/digest-libsdl-1.2.11 235
+RMD160 89a0c8a3fae02558dccc73014e242aa5d9d660a4 files/digest-libsdl-1.2.11 235
+SHA256 31cbbbd2984335490d3f0fe57585e3dc3e6bf24a0565aac0fec9a8468ccab2c1 files/digest-libsdl-1.2.11 235
+MD5 1d23ceea95bcb434636db5c8bb2719b9 files/digest-libsdl-1.2.11-r1 235
+RMD160 89a0c8a3fae02558dccc73014e242aa5d9d660a4 files/digest-libsdl-1.2.11-r1 235
+SHA256 31cbbbd2984335490d3f0fe57585e3dc3e6bf24a0565aac0fec9a8468ccab2c1 files/digest-libsdl-1.2.11-r1 235
MD5 7e12e011a146009e9cb3d75d5987624a files/digest-libsdl-1.2.7-r3 232
RMD160 a86b949aa66febb54d4fde7a16ed2d7abb7180ce files/digest-libsdl-1.2.7-r3 232
SHA256 eb73104e3f6dc374ae6d803d1600366aeab065c0ef3ee0754c97e47813e47092 files/digest-libsdl-1.2.7-r3 232
@@ -191,7 +202,7 @@ SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFQAAIamhnQswr0vIRAob7AJ4sIDUCInFnvmvGD+5uipbTV+bbmgCfdgd0
-W5Pu3xQtYXwBLoBWrp+kUYs=
-=Ez0Y
+iD8DBQFFQl/obfN2jvlVAhwRAlhIAKCXwDiUQZwxbdIk7CRwbWXrHLHk8ACeMvOk
+Tz3X3ze8wq0GeH2ydlz7aUg=
+=q9NP
-----END PGP SIGNATURE-----
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.11 b/media-libs/libsdl/files/digest-libsdl-1.2.11
index 7c37b8fdf059..0c18548c73c0 100644
--- a/media-libs/libsdl/files/digest-libsdl-1.2.11
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.11
@@ -1,3 +1,3 @@
-MD5 418b42956b7cd103bfab1b9077ccc149 SDL-1.2.11.tar.gz 2796407
-RMD160 91dc8877224415a4ba59e1de57c31861e550d644 SDL-1.2.11.tar.gz 2796407
-SHA256 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730 SDL-1.2.11.tar.gz 2796407
+MD5 dbe82ff408bccfd6992b4cf162538595 SDL-1.2.11.tar.gz 2796143
+RMD160 1ea73d45dcecde9df8e4b5c18e7cbcaedb1e4c59 SDL-1.2.11.tar.gz 2796143
+SHA256 c3f0e9b016368601697495dcdaed010ab0ee4b541d0052910f829ce318d90a2b SDL-1.2.11.tar.gz 2796143
diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.11-r1 b/media-libs/libsdl/files/digest-libsdl-1.2.11-r1
new file mode 100644
index 000000000000..0c18548c73c0
--- /dev/null
+++ b/media-libs/libsdl/files/digest-libsdl-1.2.11-r1
@@ -0,0 +1,3 @@
+MD5 dbe82ff408bccfd6992b4cf162538595 SDL-1.2.11.tar.gz 2796143
+RMD160 1ea73d45dcecde9df8e4b5c18e7cbcaedb1e4c59 SDL-1.2.11.tar.gz 2796143
+SHA256 c3f0e9b016368601697495dcdaed010ab0ee4b541d0052910f829ce318d90a2b SDL-1.2.11.tar.gz 2796143
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch b/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch
new file mode 100644
index 000000000000..cf0c265fe1be
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch
@@ -0,0 +1,11 @@
+--- src/audio/SDL_audio.c.old 2006-10-19 08:16:18.000000000 +0200
++++ src/audio/SDL_audio.c 2006-10-19 08:18:08.000000000 +0200
+@@ -591,7 +591,7 @@
+ return(-1);
+ }
+ if ( audio->convert.needed ) {
+- audio->convert.len = desired->size;
++ audio->convert.len = desired->size / audio->convert.len_ratio;
+ audio->convert.buf =(Uint8 *)SDL_AllocAudioMem(
+ audio->convert.len*audio->convert.len_mult);
+ if ( audio->convert.buf == NULL ) {
diff --git a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
new file mode 100644
index 000000000000..3b8b89577619
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.1 2006/10/27 19:36:52 tupone Exp $
+
+inherit flag-o-matic toolchain-funcs eutils libtool
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# WARNING:
+# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
+# in USE and something breaks, you pick up the pieces. Be prepared for
+# bug reports to be marked INVALID.
+IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick noflagstrip"
+RESTRICT="mirror" #147253
+
+RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
+ alsa? ( media-libs/alsa-lib )
+ esd? ( >=media-sound/esound-0.2.19 )
+ arts? ( kde-base/arts )
+ nas? (
+ media-libs/nas
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libX11
+ )
+ X? (
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libX11
+ )
+ directfb? ( >=dev-libs/DirectFB-0.9.19 )
+ ggi? ( >=media-libs/libggi-2.0_beta3 )
+ svga? ( >=media-libs/svgalib-1.4.2 )
+ aalib? ( media-libs/aalib )
+ libcaca? ( >=media-libs/libcaca-0.9-r1 )
+ opengl? ( virtual/opengl virtual/glu )"
+DEPEND="${RDEPEND}
+ nas? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ )
+ X? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ )
+ x86? ( >=dev-lang/nasm-0.98.39-r3 )"
+
+S=${WORKDIR}/SDL-${PV}
+
+pkg_setup() {
+ if use noaudio || use novideo || use nojoystick ; then
+ ewarn "Since you've chosen to turn off some of libsdl's functionality,"
+ ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+ ewarn "libsdl without the no* flags in USE. You need to know what"
+ ewarn "you're doing to selectively turn off parts of libsdl."
+ epause 30
+ fi
+ if use noflagstrip ; then
+ ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
+ ewarn "don't bother filing libsdl-related bugs until trying to remerge"
+ ewarn "libsdl without the noflagstrip use flag in USE."
+ epause 10
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-libcaca-new-api.patch #40224
+ epatch "${FILESDIR}"/${P}-sdl-config.patch
+ epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
+ epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
+ # Fix segfault when auto converting stream #151991
+ epatch "${FILESDIR}"/${P}-audioConv.patch
+
+ # add yasm-compatible defines to nasm code (hopefully we
+ # can get this killed soonish)
+ local f
+ for f in "${S}"/src/hermes/*.asm ; do
+ cat <<-EOF >> "${f}"
+ %ifidn __YASM_OBJFMT__,elf
+ section ".note.GNU-stack" noalloc noexec nowrite progbits
+ %endif
+ EOF
+ done
+
+ # yasm does not understand -i
+ # bug #147201
+ sed -i \
+ -e 's:NASMFLAGS -i:NASMFLAGS -I:' \
+ configure.in \
+ || die "sed failed"
+
+ ./autogen.sh || die "autogen failed"
+ elibtoolize
+}
+
+src_compile() {
+ local myconf=
+ if [[ $(tc-arch) != "x86" ]] ; then
+ myconf="${myconf} --disable-nasm"
+ else
+ myconf="${myconf} $(use_enable x86 nasm)"
+ fi
+ use noflagstrip || strip-flags
+ use noaudio && myconf="${myconf} --disable-audio"
+ use novideo \
+ && myconf="${myconf} --disable-video" \
+ || myconf="${myconf} --enable-video-dummy"
+ use nojoystick && myconf="${myconf} --disable-joystick"
+
+ local directfbconf="--disable-video-directfb"
+ if use directfb ; then
+ # since DirectFB can link against SDL and trigger a
+ # dependency loop, only link against DirectFB if it
+ # isn't broken #61592
+ echo 'int main(){}' > directfb-test.c
+ $(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
+ && directfbconf="--enable-video-directfb" \
+ || ewarn "Disabling DirectFB since libdirectfb.so is broken"
+ fi
+
+ myconf="${myconf} ${directfbconf}"
+
+ econf \
+ --disable-dependency-tracking \
+ --disable-rpath \
+ --enable-events \
+ --enable-cdrom \
+ --enable-threads \
+ --enable-timers \
+ --enable-endian \
+ --enable-file \
+ --enable-cpuinfo \
+ $(use_enable oss) \
+ $(use_enable alsa) \
+ $(use_enable esd) \
+ $(use_enable arts) \
+ $(use_enable nas) \
+ $(use_enable X video-x11) \
+ $(use_enable dga) \
+ $(use_enable xv video-x11-xv) \
+ $(use_enable xinerama video-x11-xinerama) \
+ $(use_enable X video-x11-xrandr) \
+ $(use_enable dga video-dga) \
+ $(use_enable fbcon video-fbcon) \
+ $(use_enable ggi video-ggi) \
+ $(use_enable svga video-svga) \
+ $(use_enable aalib video-aalib) \
+ $(use_enable libcaca video-caca) \
+ $(use_enable opengl video-opengl) \
+ $(use_with X x) \
+ --disable-video-x11-xme \
+ ${myconf} || die
+ emake || die "emake failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
+ dohtml -r ./
+}
diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild
index 402dccd4fe15..b73343d26965 100644
--- a/media-libs/libsdl/libsdl-1.2.11.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.19 2006/10/26 00:22:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.20 2006/10/27 19:36:52 tupone Exp $
inherit flag-o-matic toolchain-funcs eutils libtool
@@ -10,7 +10,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
# WARNING:
# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags
# in USE and something breaks, you pick up the pieces. Be prepared for