Drop USE="-X". Fix bug #375577

Package-Manager: portage-2.1.10.7/cvs/Linux i686

diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 09dfbb6e08439eb38274db246494a68b95fd0977..9413c01b762ae0bd888bb90facec9d022713e378 100644 (file)
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/allegro
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.105 2011/07/18 08:46:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.106 2011/07/28 08:37:56 tupone Exp $
+
+  28 Jul 2011; Tupone Alfredo <tupone@gentoo.org> allegro-5.0.3.ebuild:
+  Drop USE="-X". Fix bug #375577 by Myckel Habets
 
   18 Jul 2011; Markos Chandras <hwoarang@gentoo.org> allegro-5.0.3.ebuild:
   Stable on amd64 wrt bug #375491

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index c740d5fcd9954f19251c09a44de4b6f382fc06fc..c6042ef4108d693085306d71f60beb2a8ffd3736 100644 (file)
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX allegro-4.4.1.1-optional_drivers.patch 1500 RMD160 c3c261860fe46d62059cc4958d5019f493c6d27c SHA1 08c3dc9e9edf5fcd2834243c39d8296c5a9a0ee1 SHA256 b38d94cd954117b179bfb8e64001e7c687dc841314d525b99e5bd334a431c700
 AUX allegro-4.4.1.1-rpath.patch 178 RMD160 4f33620f559355fa38502d5ba6e0eb365f501326 SHA1 272322280645098a32b868e8c43cbfc5f916a650 SHA256 baab915e625d59950573ed053587226f28adc59a18bbe39a10a732cb906b2188
@@ -12,23 +12,13 @@ DIST allegro-5.0.1.tar.gz 3016708 RMD160 39f46ab64a89725b10e87d7b351f47742a2688a
 DIST allegro-5.0.3.tar.gz 3018367 RMD160 b4106df6aff86a9abd7833c79ea056e521ef1541 SHA1 0ac8383ca0d0aedeb7792810b50318f8d60247cb SHA256 011016c8aff478ff8e9f236215ec99ceedfddc7d2c22b50284f97415100d4844
 EBUILD allegro-4.4.1.1-r1.ebuild 2746 RMD160 fb7f6262e233773d0154fa88bce6bf460bbdb215 SHA1 358bd433e2ce60c93050fa3ce975ad386ae2d17b SHA256 fb56e18eced61229eb2fdd4d5246792d02d01c7e8738e8c1ef8d3163b4f99ba4
 EBUILD allegro-5.0.1.ebuild 2321 RMD160 51502df725708947ebd5cb3a50c03b4c2b93a0f3 SHA1 a2caa2b515e1b558e903e7899ca84a5a9bdc5909 SHA256 37fcec677e2ca239917c63c3dfc0bfddd6b62f67bd04aa9da7340fa7953df3c6
-EBUILD allegro-5.0.3.ebuild 2272 RMD160 d11003a0118f2ffef8fa55294ba422b025ea2688 SHA1 8313095d48294cf2afac62bfc5c34251988622da SHA256 89315d46cf6176d5c8a23f42d00de3eeaccfdc0582ae130735a1c4e3cd8ed779
-MISC ChangeLog 13856 RMD160 c5ebcbd9526204d402e616eb495833584f342407 SHA1 0b4ab277a6efb5f0a8d547a4cbdfd72608ee2699 SHA256 bc25c4af983cd8ba206fc1786002f6a8bb73d2f314703ab381d4d7b305448cd4
+EBUILD allegro-5.0.3.ebuild 2007 RMD160 64d5cdd83c3deffa66726afc5946f0e6769f0f35 SHA1 a3a77febd585276e654d22b92693626c06af50f6 SHA256 22532792520ae5535e90ba67f38e82456444cb88320cacbbd799135f755cdaf4
+MISC ChangeLog 13977 RMD160 d66d3b376cee3c647510079fdffdc7537f50e868 SHA1 785a6849a8f954a47408b1c334821d108bc2bed0 SHA256 da18e53d2205d4e3e9c8a3c8a2736a1356d4db814e35bcd6f6cc0938a7e7881b
 MISC metadata.xml 856 RMD160 a0cd388cc7fb773c0e20ec21d4989613f125f7fa SHA1 d45cced73383b0a1365eb3f407510454fb439635 SHA256 5a9ff2cd7ed67f377dd3ac080aaff9cefbef7c26ef04463467d31482c0dd5493
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOI/L2AAoJEPqDWhW0r/LCB4IQAIopGCS9AxBG8068JbV1Hg/A
-XpQiY0LVCrrF5FP8LchrRXZDwQfyDYuxGk8mx5uUusuNlrLG8ehAUrgO1bZedUVm
-ybqnjRbaFtu1I/A6yKQWCf0YseGYYAuFVdy+h7pl88gvV7WPBV3Vv5RR2YlG9i6M
-PIglC0BAzaKrMXy4wwFkQT/Jh7Xem0pnCFGgaxfWh7/SS4uo8lLruG8uM2qNFhS6
-KPiGb1iiCCUrfv98FlR2gN2LDx9iiPVnC8eQlz6MHsjwfcWwKCSEEuuOJ4dX00nI
-RxG79uFbP68Szfo6rx4BKC44KSOmx5PxEPdUp3xiEttYWSy3/stvghmPXJEqUUkR
-8LoA3UDnSWL5GUwdVO/VkymwUjvl1wU/M2Vm19V4LCGW+lpSC6jlU/wdT3DD1UPH
-DwqbtGVLsiitcRBrCLwdilwee+Z0HtBIgCdpMVCEjaxq6kN/Z+wzpxk43oV3C9Qe
-LnsrDXBQ3gK0FJoFmtkZ3Evi5J5tI3qmZLAy66qGQrG2bbOq1oYsKO8fdRFWC2ZK
-nJCTNRxi5cqyMjPwoO7Oqk7tfLbDVwKkhR7+RIgB99uaLiRk4J5YWIxbGgRyDlo2
-5s2mD+wPtmgxDt2mOTuFh3oPwgs0GH3A0t0HAsDfGbz5cXQOMZJJuEQLeUKbWdLJ
-UpuVm2U4iqsK6dWSVONz
-=VViK
+iEYEARECAAYFAk4xH9QACgkQIY77eQFFFC2XFACeOfDCnA4KfAOPFjnqs/br3+ih
+H+MAn2TEZxDKNyJ4CN/MsLdLNhUiUzr4
+=LTjn
 -----END PGP SIGNATURE-----

diff --git a/media-libs/allegro/allegro-5.0.3.ebuild b/media-libs/allegro/allegro-5.0.3.ebuild
index 0daa08e9f4ad75bf97d65db8a29fe7407478a99c..809103a4f02d43eb1618f880b0ff6badc8ad7030 100644 (file)
--- a/media-libs/allegro/allegro-5.0.3.ebuild
+++ b/media-libs/allegro/allegro-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.3.ebuild,v 1.2 2011/07/18 08:46:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-5.0.3.ebuild,v 1.3 2011/07/28 08:37:56 tupone Exp $
 
 EAPI=2
 inherit cmake-utils
@@ -22,27 +22,21 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
        physfs? ( dev-games/physfs )
        png? ( >=media-libs/libpng-1.4 )
        pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-       truetype? ( >=media-libs/freetype-2
-               sys-libs/zlib )
+       truetype? ( >=media-libs/freetype-2 )
        vorbis? ( media-libs/libvorbis )
-       X? (
-               x11-libs/libXext
-               x11-libs/libXcursor
-               x11-libs/libXxf86vm
-               x11-libs/libXrandr
-               x11-libs/libX11
-               x11-libs/libXpm
-               gtk? ( x11-libs/gtk+:2 )
-               virtual/opengl
-               xinerama? ( x11-libs/libXinerama )
-       )"
+       x11-libs/libXcursor
+       x11-libs/libXxf86vm
+       x11-libs/libXrandr
+       x11-libs/libX11
+       gtk? ( x11-libs/gtk+:2 )
+       virtual/opengl
+       xinerama? ( x11-libs/libXinerama )"
+
 DEPEND="${RDEPEND}
        dev-util/pkgconfig
-       X? (
-               x11-proto/xextproto
-               x11-proto/xf86vidmodeproto
-               x11-proto/xproto
-       )"
+       x11-proto/xextproto
+       x11-proto/xf86vidmodeproto
+       x11-proto/xproto"
 
 PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
 
@@ -62,22 +56,10 @@ src_configure() {
                $(cmake-utils_use_want test TESTS)
                $(cmake-utils_use_want truetype TTF)
                $(cmake-utils_use_want vorbis)
-               $(cmake-utils_use_want X X11)
-               )
-
-       if use X; then
-               mycmakeargs+=(
-                       $(cmake-utils_use_want gtk NATIVE_DIALOG)
-                       $(cmake-utils_use_want X opengl)
-                       $(cmake-utils_use_want xinerama X11_XINERAMA)
-                       )
-       else
-               mycmakeargs+=(
-                       -DWANT_NATIVE_DIALOG=OFF
-                       -DWANT_OPENGL=OFF
-                       -DWANT_X11_XINERAMA=OFF
-                       )
-       fi
+               $(cmake-utils_use_want gtk NATIVE_DIALOG)
+               $(cmake-utils_use_want X opengl)
+               $(cmake-utils_use_want xinerama X11_XINERAMA)
+       )
 
        cmake-utils_src_configure
 }