From 38f192b3d0ec298b2002b79090baee3438ac9a50 Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 2 Feb 2007 23:59:14 +0000 Subject: [PATCH] strip ldflags from allegro-config --libs Package-Manager: portage-2.1.2-r6 --- media-libs/allegro/ChangeLog | 6 +- media-libs/allegro/Manifest | 54 +++------ media-libs/allegro/allegro-4.0.3.ebuild | 102 ---------------- media-libs/allegro/allegro-4.1.18.ebuild | 109 ------------------ media-libs/allegro/allegro-4.2.1.ebuild | 15 +-- .../allegro/files/allegro-4.1.18-gcc4.patch | 35 ------ .../allegro/files/allegro-4.1.18-m4.patch | 11 -- .../allegro/files/allegro-4.2.1-flags.patch | 52 ++++++--- media-libs/allegro/files/digest-allegro-4.0.3 | 3 - .../allegro/files/digest-allegro-4.1.18 | 3 - 10 files changed, 59 insertions(+), 331 deletions(-) delete mode 100644 media-libs/allegro/allegro-4.0.3.ebuild delete mode 100644 media-libs/allegro/allegro-4.1.18.ebuild delete mode 100644 media-libs/allegro/files/allegro-4.1.18-gcc4.patch delete mode 100644 media-libs/allegro/files/allegro-4.1.18-m4.patch delete mode 100644 media-libs/allegro/files/digest-allegro-4.0.3 delete mode 100644 media-libs/allegro/files/digest-allegro-4.1.18 diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog index 596f97273548..a0f26c9470f8 100644 --- a/media-libs/allegro/ChangeLog +++ b/media-libs/allegro/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/allegro # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.62 2007/02/02 20:25:46 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.63 2007/02/02 23:59:14 nyhm Exp $ + + 02 Feb 2007; Tristan Heaven + files/allegro-4.2.1-flags.patch, allegro-4.2.1.ebuild: + strip ldflags from allegro-config --libs 02 Feb 2007; Tristan Heaven allegro-4.2.1.ebuild: Add vga USE flag for bug #129534 diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest index 9ce3778e255c..1f0cb6e47477 100644 --- a/media-libs/allegro/Manifest +++ b/media-libs/allegro/Manifest @@ -1,14 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX allegro-4.1.18-gcc4.patch 705 RMD160 1729db5d75acc244074cba643ac84fecfee05c3f SHA1 c2d87601a8f2b792fa95c5f81fc13311ed7aafd9 SHA256 86d71b0567201c35ab10e3521cb92a4e5782a9e0302159002be683909596da9e -MD5 183ff716610d14fddd546ed17fea27c8 files/allegro-4.1.18-gcc4.patch 705 -RMD160 1729db5d75acc244074cba643ac84fecfee05c3f files/allegro-4.1.18-gcc4.patch 705 -SHA256 86d71b0567201c35ab10e3521cb92a4e5782a9e0302159002be683909596da9e files/allegro-4.1.18-gcc4.patch 705 -AUX allegro-4.1.18-m4.patch 468 RMD160 3aa877cc8759890c46ea4deca9d454a9177df5ed SHA1 1957794760ebd6c23c40e40aa88500437b0c9b12 SHA256 8f747d187f8e72ac79a7605279890eb7b39c631b007bc3f178af6ec011d53729 -MD5 80085d45008c152850633d5746809bd0 files/allegro-4.1.18-m4.patch 468 -RMD160 3aa877cc8759890c46ea4deca9d454a9177df5ed files/allegro-4.1.18-m4.patch 468 -SHA256 8f747d187f8e72ac79a7605279890eb7b39c631b007bc3f178af6ec011d53729 files/allegro-4.1.18-m4.patch 468 AUX allegro-4.2.0-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 SHA1 6cd70fb48ca88df77a7bc00f5f5f2e37703b3cf4 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64 MD5 38a8238eb574242bc74fbd53ff5edffb files/allegro-4.2.0-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 files/allegro-4.2.0-exec-stack.patch 4523 @@ -21,27 +13,17 @@ AUX allegro-4.2.1-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285 MD5 38a8238eb574242bc74fbd53ff5edffb files/allegro-4.2.1-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 files/allegro-4.2.1-exec-stack.patch 4523 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64 files/allegro-4.2.1-exec-stack.patch 4523 -AUX allegro-4.2.1-flags.patch 1369 RMD160 ef4313be14d08122499aea255a4a3d7fd66b51aa SHA1 7c427caabfdc7806cd3ad8230d588a1103cf42de SHA256 78fd78bc9cb67dcf85e90c172b7cf65f4edb83a7a64937561663091cf9c470c0 -MD5 3b6daf3fcbc03e6d33d72f3bf9400028 files/allegro-4.2.1-flags.patch 1369 -RMD160 ef4313be14d08122499aea255a4a3d7fd66b51aa files/allegro-4.2.1-flags.patch 1369 -SHA256 78fd78bc9cb67dcf85e90c172b7cf65f4edb83a7a64937561663091cf9c470c0 files/allegro-4.2.1-flags.patch 1369 -DIST allegro-4.0.3.tar.gz 2440083 RMD160 920b5536c71a7dfc60b0cfa39a7d14a780b270f7 SHA1 726d7ac6f9a0c5765ba3b8e53b6ff7dec48834d0 SHA256 fefd91ead73d1e3c3109440e2d465ee7e56eb88f0952199d36b3bc2a2f221f0f +AUX allegro-4.2.1-flags.patch 1803 RMD160 a763db13a5e81fe5b3807cdfe1111d0db70717a0 SHA1 7c0c508edde5140df47ce7fcb901534141edb220 SHA256 a2160c80f33c2e91436c5f00867d23a98f290e250f956b0ebfebca624f3bb283 +MD5 9fffed43ea886a0c1467ec8a0d4c9b60 files/allegro-4.2.1-flags.patch 1803 +RMD160 a763db13a5e81fe5b3807cdfe1111d0db70717a0 files/allegro-4.2.1-flags.patch 1803 +SHA256 a2160c80f33c2e91436c5f00867d23a98f290e250f956b0ebfebca624f3bb283 files/allegro-4.2.1-flags.patch 1803 DIST allegro-4.1.14.tar.gz 2774495 RMD160 511712ca0c4deb81d1426093240261948a71f53c SHA1 3b2cf8089304f7904ba0e4dfba3ef46bd99b8a37 SHA256 ee7c6d04f7e64778baf2c161bc0b564d5298a5dc575c3de3d5fce939c5d11b13 -DIST allegro-4.1.18.tar.gz 2900486 RMD160 05dc8ca8783487c9cca694bc22f95a06e77d64fe SHA1 6bfed4fc3e5cfcd8ad8ab1dc1744023f0b5e702e SHA256 a1d588449d467cd3a0a9c116402f531ef2eb7f8d58836663d12c5188b4cd9982 DIST allegro-4.2.0.tar.gz 3056173 RMD160 e1602ea2f8bc1761be0ee34001e9d77d3a6ea3ff SHA1 5b4a542c038ee196564f9107de59fe30a8caeaf5 SHA256 d8df27558bc083298d6933c843d4fdaf9afc0aa1607276acc96ed8fa9a39060c DIST allegro-4.2.1.tar.gz 3107022 RMD160 acbc976409b9db92d5588b41cb389c06b6d4d2ea SHA1 1593f24fe92eae58512447145511c84398ca8926 SHA256 a800a4c61db448e327c13b898fa9bdc00bea43319266a27ad37435f68c5d414b -EBUILD allegro-4.0.3.ebuild 2375 RMD160 e9d7d30effde15db77c64ace87e577843e918252 SHA1 6ce397905ccb1c71de45dcabd24ece57678c65f1 SHA256 03040704acec735b7b4150a7496bd4a2e3b4857f60c7ee83f450a075c1541449 -MD5 945c19cdbd668a5fb2c4bacb59d7d2b4 allegro-4.0.3.ebuild 2375 -RMD160 e9d7d30effde15db77c64ace87e577843e918252 allegro-4.0.3.ebuild 2375 -SHA256 03040704acec735b7b4150a7496bd4a2e3b4857f60c7ee83f450a075c1541449 allegro-4.0.3.ebuild 2375 EBUILD allegro-4.1.14.ebuild 2228 RMD160 1a4d895ec97cf94fffa2d18bf10f07478f32ca17 SHA1 9200f393a3af0593dbfee37828ad753862ad2ab2 SHA256 593cde427fe7c00aa8e053ad27067d68bce0d40230a8b1d302e831b4d73d13df MD5 2cceaf6f1e6e71569a2f6b6cbf6d5057 allegro-4.1.14.ebuild 2228 RMD160 1a4d895ec97cf94fffa2d18bf10f07478f32ca17 allegro-4.1.14.ebuild 2228 SHA256 593cde427fe7c00aa8e053ad27067d68bce0d40230a8b1d302e831b4d73d13df allegro-4.1.14.ebuild 2228 -EBUILD allegro-4.1.18.ebuild 2480 RMD160 0db3941fb920c7537ed55a0a9d93d202354fb0a1 SHA1 28388bb9eb3f41bd0f680e6727505071445bc6e2 SHA256 052de73f370b380f618132c9cedabdfdc8a124ea3bbbc729453c9a8c96384755 -MD5 d7c4b0d63108318f3fbf8660302893c6 allegro-4.1.18.ebuild 2480 -RMD160 0db3941fb920c7537ed55a0a9d93d202354fb0a1 allegro-4.1.18.ebuild 2480 -SHA256 052de73f370b380f618132c9cedabdfdc8a124ea3bbbc729453c9a8c96384755 allegro-4.1.18.ebuild 2480 EBUILD allegro-4.2.0-r1.ebuild 2595 RMD160 7cc5e5e440a9e5d220d8cfb9d0c3f396a6fa6f64 SHA1 556f3b42835c674a6231f5da6c3f0e7eb6cbab9f SHA256 0b82d40c079f97f6acee76bef31b767926a88223981265936f2b3734809a330f MD5 81880c86b35c3b8319acf6029f801e11 allegro-4.2.0-r1.ebuild 2595 RMD160 7cc5e5e440a9e5d220d8cfb9d0c3f396a6fa6f64 allegro-4.2.0-r1.ebuild 2595 @@ -50,27 +32,21 @@ EBUILD allegro-4.2.0-r2.ebuild 2638 RMD160 6e5eb7166b729b650af6134252cfb432cfd59 MD5 530e290e583319a69de77e8ebf867b32 allegro-4.2.0-r2.ebuild 2638 RMD160 6e5eb7166b729b650af6134252cfb432cfd592fd allegro-4.2.0-r2.ebuild 2638 SHA256 f080e7afb9a00bf020fa7e93268e06afeaca901204108d5ef28cbfbe3d71f592 allegro-4.2.0-r2.ebuild 2638 -EBUILD allegro-4.2.1.ebuild 2294 RMD160 6dc8a34d497932ba80a49624f02cf83dec5a7896 SHA1 a4b60bf654f32ef35a068e3bb9696977a9e47cc3 SHA256 1f68f20048fc1d48d9fece73364f46a2f5eb934ab4e0e4d0cb3916004c3a2933 -MD5 cd9a179848b94dbfce44608262c214f7 allegro-4.2.1.ebuild 2294 -RMD160 6dc8a34d497932ba80a49624f02cf83dec5a7896 allegro-4.2.1.ebuild 2294 -SHA256 1f68f20048fc1d48d9fece73364f46a2f5eb934ab4e0e4d0cb3916004c3a2933 allegro-4.2.1.ebuild 2294 -MISC ChangeLog 8080 RMD160 7b74d842711ac633c452d3a37f0edd6ecfda4b84 SHA1 f70c261f361a7e2c97aa88fd9d6bc50c04547fb7 SHA256 64dee04964e3e2f9721b395ad540196e0e0e9a0b4eb7137b622a3b21ea3cd975 -MD5 9e592dff5580007c2316ed8bc088a092 ChangeLog 8080 -RMD160 7b74d842711ac633c452d3a37f0edd6ecfda4b84 ChangeLog 8080 -SHA256 64dee04964e3e2f9721b395ad540196e0e0e9a0b4eb7137b622a3b21ea3cd975 ChangeLog 8080 +EBUILD allegro-4.2.1.ebuild 2002 RMD160 28677d855b05ac1c11594e4818350c599f281c61 SHA1 9a2a9e6960ab3d07962f04dc8bf4ae93b9ef4db5 SHA256 efb1794b007b948ad73bd37b426912e6d961238c980d84e5e982c9c29f47656f +MD5 e0d4de5fb666e619818d5764a7f3f873 allegro-4.2.1.ebuild 2002 +RMD160 28677d855b05ac1c11594e4818350c599f281c61 allegro-4.2.1.ebuild 2002 +SHA256 efb1794b007b948ad73bd37b426912e6d961238c980d84e5e982c9c29f47656f allegro-4.2.1.ebuild 2002 +MISC ChangeLog 8229 RMD160 1f239ac92f405b3b4dc2d99673aeec1dfa401519 SHA1 1eb489b79cf383fea0b1cc3d3711e95e77096de2 SHA256 050a6d3e17052f7c02997e42e6edeacc2dee31145cef9d8c0749aa9e59bbfc0a +MD5 ffe6f85a6623aed7b0d150132bca56df ChangeLog 8229 +RMD160 1f239ac92f405b3b4dc2d99673aeec1dfa401519 ChangeLog 8229 +SHA256 050a6d3e17052f7c02997e42e6edeacc2dee31145cef9d8c0749aa9e59bbfc0a ChangeLog 8229 MISC metadata.xml 636 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 SHA1 bd01d531b12f11d21d75cd91cf9fa6c34505e2de SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636 RMD160 b2926813da5e98049d86fa5e2fc4a75d16b12b69 metadata.xml 636 SHA256 e26af044016a39f2ef99c3796d0cee3e84ca728501af8e71d7f91bd1d9edb3bc metadata.xml 636 -MD5 5b8917694bab160e413754d1d7e1fd99 files/digest-allegro-4.0.3 244 -RMD160 e80fe3b653ae68107f77f38942d8ed54e8867a70 files/digest-allegro-4.0.3 244 -SHA256 4701348f793595f25b22893d5ce0d0cb4bed25b286cdd668d21fd09b632e2978 files/digest-allegro-4.0.3 244 MD5 839c3045ec079e1039f9669c1dcb8044 files/digest-allegro-4.1.14 247 RMD160 ab790244155c1723d7fa0c11079f4704a3d63ad9 files/digest-allegro-4.1.14 247 SHA256 d744bf1be6721b6259d8cf54ca81c830f5a2b09a8b46723b243bd25f5aa84df3 files/digest-allegro-4.1.14 247 -MD5 0e85c69a2481b1a5913085ce1833c999 files/digest-allegro-4.1.18 247 -RMD160 8720a15f01c8221ae261c24fee406c60866cf235 files/digest-allegro-4.1.18 247 -SHA256 ad6b152f1d79fc9451e33f14fbce8feba230f8c55884ac86bdecb130c1520b95 files/digest-allegro-4.1.18 247 MD5 2ac185f9549cd04da9fe501611ba09a5 files/digest-allegro-4.2.0-r1 244 RMD160 62ae56f916cfb604276666e75b12d34e7c2413df files/digest-allegro-4.2.0-r1 244 SHA256 51789d055eb913090d7428c659fd08bfe9af906938fcee59941759f794c0bf99 files/digest-allegro-4.2.0-r1 244 @@ -83,7 +59,7 @@ SHA256 fb81d91cb8e7ed036c469f90249f937d0b3039cc7a2ef92674e6e452787182fb files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFw55Rdz7hIScOURERAiw0AKC0Z2+dzNhyf6doMPLYJUuvOIK18ACfXt3L -6tAUpcXgi/NKmqyO3V6xqu4= -=B4KF +iD8DBQFFw9BZdz7hIScOURERAkNdAJ9elVE0E1N8gtc+p3zeg0bdleE2wwCfZKgJ +3jcN4zqYF/l3kvaJl3NcOOs= +=H2BS -----END PGP SIGNATURE----- diff --git a/media-libs/allegro/allegro-4.0.3.ebuild b/media-libs/allegro/allegro-4.0.3.ebuild deleted file mode 100644 index 8523389c25cb..000000000000 --- a/media-libs/allegro/allegro-4.0.3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.3.ebuild,v 1.12 2006/03/31 21:15:34 tupone Exp $ - -inherit flag-o-matic - -DESCRIPTION="cross-platform multimedia library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" - -LICENSE="Allegro" -SLOT="0" -KEYWORDS="x86 sparc" -IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - esd? ( media-sound/esound ) - arts? ( kde-base/arts ) - X? ( - || ( - ( - x11-libs/libXxf86vm - x11-libs/libXxf86dga - ) - virtual/x11 - ) - ) - svga? ( media-libs/svgalib )" -DEPEND="${RDEPEND} - X? ( - || ( - ( - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - ) - virtual/x11 - ) - ) - tetex? ( virtual/tetex )" - -src_unpack() { - unpack ${A} - # remove the prototype for malloc for gcc34 (bug #58279) - sed -i \ - -e '/*malloc/d' \ - -e '/TARGET_ARCH=/s:=.*:=:' \ - ${S}/configure \ - || die 'couldnt remove pentium cpu' -} - -src_compile() { - filter-flags -fPIC - econf \ - --enable-linux \ - --enable-vga \ - $(use_enable static) \ - $(use_enable static staticprog) \ - $(use_enable mmx) \ - $(use_enable sse) \ - $(use_enable oss ossdigi) \ - $(use_enable oss ossmidi) \ - $(use_enable alsa alsadigi) \ - $(use_enable alsa alsamidi) \ - $(use_enable esd esddigi) \ - $(use_enable arts artsdigi) \ - $(use_with X x) \ - $(use_enable X xwin-shm) \ - $(use_enable X xwin-vidmode) \ - $(use_enable X xwin-dga) \ - $(use_enable X xwin-dga2) \ - $(use_enable fbcon) \ - $(use_enable svga svgalib) \ - || die - - sed -i \ - -e "/CFLAGS =.*/s:$: ${CFLAGS}:" \ - makefile \ - || die "sed makefile failed" - emake -j1 || die # parallel fails - - if use tetex ; then - addwrite /var/lib/texmf - addwrite /usr/share/texmf - addwrite /var/cache/fonts - make docs-dvi docs-ps || die - fi -} - -src_install() { - addpredict /usr/share/info - make DESTDIR=${D} install install-gzipped-man install-gzipped-info || die - - # Different format versions of the Allegro documentation - dodoc AUTHORS CHANGES THANKS readme.txt todo.txt - use tetex && dodoc docs/allegro.{dvi,ps} - use doc && dodoc examples/* - dohtml docs/html/* - docinto txt ; dodoc docs/txt/*.txt - docinto rtf ; dodoc docs/rtf/*.rtf - docinto build ; dodoc docs/build/*.txt -} diff --git a/media-libs/allegro/allegro-4.1.18.ebuild b/media-libs/allegro/allegro-4.1.18.ebuild deleted file mode 100644 index f7a43760c969..000000000000 --- a/media-libs/allegro/allegro-4.1.18.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.1.18.ebuild,v 1.8 2006/07/13 13:11:21 agriffis Exp $ - -inherit flag-o-matic eutils - -DESCRIPTION="cross-platform multimedia library" -HOMEPAGE="http://alleg.sourceforge.net/" -SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" - -LICENSE="Allegro" -SLOT="0" -#-amd64, -sparc: inportb, outportb, outportw undefined -KEYWORDS="~alpha ~amd64 ia64 ppc -sparc ~x86" -IUSE="static mmx sse oss alsa esd arts X fbcon svga tetex doc" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - esd? ( media-sound/esound ) - arts? ( kde-base/arts ) - X? ( - || ( - ( - x11-libs/libXxf86vm - x11-libs/libXxf86dga - ) - virtual/x11 - ) - ) - svga? ( media-libs/svgalib )" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - X? ( - || ( - ( - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/xf86vidmodeproto - ) - virtual/x11 - ) - ) - tetex? ( virtual/tetex )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-m4.patch - epatch "${FILESDIR}"/${P}-gcc4.patch - sed -i \ - -e 's/&_oss_\(numfrags\|fragsize\)/NULL/' \ - "${S}/setup/setup.c" \ - || die "sed failed" -} - -src_compile() { - filter-flags -fPIC -fprefetch-loop-arrays - econf \ - --enable-linux \ - --enable-vga \ - $(use_enable static) \ - $(use_enable static staticprog) \ - $(use_enable mmx) \ - $(use_enable sse) \ - $(use_enable oss ossdigi) \ - $(use_enable oss ossmidi) \ - $(use_enable alsa alsadigi) \ - $(use_enable alsa alsamidi) \ - $(use_enable esd esddigi) \ - $(use_enable arts artsdigi) \ - $(use_with X x) \ - $(use_enable X xwin-shm) \ - $(use_enable X xwin-vidmode) \ - $(use_enable X xwin-dga) \ - $(use_enable X xwin-dga2) \ - $(use_enable fbcon) \ - $(use_enable svga svgalib) \ - || die - - emake -j1 CFLAGS="${CFLAGS}" || die "emake failed" - - if use tetex ; then - addwrite /var/lib/texmf - addwrite /usr/share/texmf - addwrite /var/cache/fonts - make docs-dvi docs-ps || die - fi -} - -src_install() { - addpredict /usr/share/info - make DESTDIR="${D}" \ - install \ - install-gzipped-man \ - install-gzipped-info \ - || die "make install failed" - - # Different format versions of the Allegro documentation - dodoc AUTHORS CHANGES THANKS readme.txt todo.txt - use tetex && dodoc docs/allegro.{dvi,ps} - use doc && dodoc examples/* - dohtml docs/html/* - docinto txt - dodoc docs/txt/*.txt - docinto rtf - dodoc docs/rtf/*.rtf - docinto build - dodoc docs/build/*.txt -} diff --git a/media-libs/allegro/allegro-4.2.1.ebuild b/media-libs/allegro/allegro-4.2.1.ebuild index 3660ae2ff9b2..0d40034de957 100644 --- a/media-libs/allegro/allegro-4.2.1.ebuild +++ b/media-libs/allegro/allegro-4.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.2 2007/02/02 20:25:46 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.1.ebuild,v 1.3 2007/02/02 23:59:14 nyhm Exp $ -inherit eutils +inherit autotools eutils DESCRIPTION="cross-platform multimedia library" HOMEPAGE="http://alleg.sourceforge.net/" @@ -40,6 +40,7 @@ src_unpack() { epatch \ "${FILESDIR}"/${P}-exec-stack.patch \ "${FILESDIR}"/${P}-flags.patch + eautoreconf } src_compile() { @@ -64,7 +65,7 @@ src_compile() { $(use_enable svga svgalib) \ $(use_enable vga) \ || die - emake -j1 CFLAGS="${CFLAGS}" || die "emake failed" + emake -j1 || die "emake failed" } src_install() { @@ -82,11 +83,3 @@ src_install() { docinto build dodoc docs/build/*.txt } - -pkg_postinst() { - ewarn "\"revdep-rebuild\" must be run now for applications already" - ewarn "using allegro to continue to work." - ewarn "revdep-rebuild is part of the gentoolkit package." - ewarn "(Run \"emerge gentoolkit\" if revdep-rebuild isn't already" - ewarn "available on your system.)" -} diff --git a/media-libs/allegro/files/allegro-4.1.18-gcc4.patch b/media-libs/allegro/files/allegro-4.1.18-gcc4.patch deleted file mode 100644 index 28f65563cb3d..000000000000 --- a/media-libs/allegro/files/allegro-4.1.18-gcc4.patch +++ /dev/null @@ -1,35 +0,0 @@ -Clean up code to work with gcc4 - -patch by Mark Loeser - ---- allegro-4.1.18/src/gui.c -+++ allegro-4.1.18/src/gui.c -@@ -1798,6 +1798,7 @@ - - - -+static int shutdown_single_menu(MENU_PLAYER *, int *); - /* update_menu: - * Updates the status of a menu player object returned by init_menu(), - * returning TRUE if it is still active or FALSE if it has finished. -@@ -1810,8 +1810,6 @@ - */ - int update_menu(MENU_PLAYER *player) - { -- static int shutdown_single_menu(MENU_PLAYER *, int *); -- - MENU_PLAYER *i; - int c, c2; - int old_sel, child_ret; ---- allegro-4.1.18/src/sound.c -+++ allegro-4.1.18/src/sound.c -@@ -25,7 +25,7 @@ - - - --extern DIGI_DRIVER digi_none; -+static DIGI_DRIVER digi_none; - - - - diff --git a/media-libs/allegro/files/allegro-4.1.18-m4.patch b/media-libs/allegro/files/allegro-4.1.18-m4.patch deleted file mode 100644 index d2ea265e95c2..000000000000 --- a/media-libs/allegro/files/allegro-4.1.18-m4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/allegro.m4 -+++ misc/allegro.m4 -@@ -11,7 +11,7 @@ - dnl AM_PATH_allegro([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for allegro, and define allegro_CFLAGS and allegro_LIBS - dnl --AC_DEFUN(AM_PATH_ALLEGRO,[ -+AC_DEFUN([AM_PATH_ALLEGRO],[ - AC_ARG_WITH(allegro-prefix, - [ --with-allegro-prefix=PFX Prefix where liballegro is installed (optional)], - ALLEGRO_CONFIG_prefix="$withval", ALLEGRO_CONFIG_prefix="") diff --git a/media-libs/allegro/files/allegro-4.2.1-flags.patch b/media-libs/allegro/files/allegro-4.2.1-flags.patch index 26aee313d06d..57435622b5d7 100644 --- a/media-libs/allegro/files/allegro-4.2.1-flags.patch +++ b/media-libs/allegro/files/allegro-4.2.1-flags.patch @@ -1,23 +1,19 @@ ---- configure -+++ configure -@@ -2880,7 +2880,6 @@ - echo "$as_me:$LINENO: checking whether linker works with -s option" >&5 - echo $ECHO_N "checking whether linker works with -s option... $ECHO_C" >&6 - allegro_save_LDFLAGS=$LDFLAGS --LDFLAGS="-s $LDFLAGS" - if test "${allegro_cv_prog_ld_s+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4959,7 +4958,7 @@ +--- configure.in ++++ configure.in +@@ -280,11 +280,7 @@ + COMPILE_PROGRAM=COMPILE_NORMAL COMPILE_CXX_PROGRAM=COMPILE_CXX_NORMAL COMPILE_S_PROGRAM=COMPILE_S_NORMAL - if test "X$allegro_cv_prog_ld_s" = "Xyes"; then +- if test "X$allegro_cv_prog_ld_s" = "Xyes"; then - PROG_LDFLAGS="-s \$(LDFLAGS)" -+ PROG_LDFLAGS="\$(LDFLAGS)" - else - PROG_LDFLAGS="\$(LDFLAGS)" - fi -@@ -11367,11 +11366,7 @@ +- else +- PROG_LDFLAGS="\$(LDFLAGS)" +- fi ++ PROG_LDFLAGS="\$(LDFLAGS)" + LIB_TO_LINK=alleg + PLUGIN_LIB=lib/unix/libaldat.a + allegro_build_normal_library=yes +@@ -761,11 +757,7 @@ ALLEGRO_DEBUG_CFLAGS="$ALLEGRO_DEBUG_CFLAGS -DDMALLOC" fi ALLEGRO_PROFILE_CFLAGS="$CFLAGS -pg $TARGET_ARCH -O2 -funroll-loops -ffast-math $WFLAGS" @@ -30,6 +26,28 @@ ALLEGRO_SFLAGS="-x assembler-with-cpp" ALLEGRO_SHAREDLIB_CFLAGS="-fPIC -DALLEGRO_SHARED" else +--- misc/allegro-config.in ++++ misc/allegro-config.in +@@ -21,7 +21,6 @@ + + accepts_frameworks=no + +-allegro_ldflags="@LDFLAGS@" + allegro_libs="@LIBS@" + allegro_frameworks="@FRAMEWORKS@" + allegro_cflags="" +@@ -180,9 +179,9 @@ + if test "$echo_libs" = "yes"; then + libdirs=-L${exec_prefix}/lib + if test "$static_libs" = "yes"; then +- echo $libdirs $allegro_ldflags -l${lib_type} $allegro_libs ++ echo $libdirs -l${lib_type} $allegro_libs + else +- echo $libdirs $allegro_ldflags -l${lib_type}-${version} -l${lib_type}_unsharable ++ echo $libdirs -l${lib_type}-${version} -l${lib_type}_unsharable + fi + fi + --- misc/deplib.sh +++ misc/deplib.sh @@ -70,7 +70,7 @@ diff --git a/media-libs/allegro/files/digest-allegro-4.0.3 b/media-libs/allegro/files/digest-allegro-4.0.3 deleted file mode 100644 index 49f3ed389a5a..000000000000 --- a/media-libs/allegro/files/digest-allegro-4.0.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 4fd1d27c323ba33b6d6cad6c5a1d8a44 allegro-4.0.3.tar.gz 2440083 -RMD160 920b5536c71a7dfc60b0cfa39a7d14a780b270f7 allegro-4.0.3.tar.gz 2440083 -SHA256 fefd91ead73d1e3c3109440e2d465ee7e56eb88f0952199d36b3bc2a2f221f0f allegro-4.0.3.tar.gz 2440083 diff --git a/media-libs/allegro/files/digest-allegro-4.1.18 b/media-libs/allegro/files/digest-allegro-4.1.18 deleted file mode 100644 index 6a3fadeb84fe..000000000000 --- a/media-libs/allegro/files/digest-allegro-4.1.18 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 215b84351f349f5998a77f99bf1218fa allegro-4.1.18.tar.gz 2900486 -RMD160 05dc8ca8783487c9cca694bc22f95a06e77d64fe allegro-4.1.18.tar.gz 2900486 -SHA256 a1d588449d467cd3a0a9c116402f531ef2eb7f8d58836663d12c5188b4cd9982 allegro-4.1.18.tar.gz 2900486 -- 2.26.2