media-libs/allegro: 5.0.11 EAPI-6 bump

Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/media-libs/allegro/allegro-5.0.11.ebuild b/media-libs/allegro/allegro-5.0.11.ebuild
index f54c046fec531ffe1859b64ee6efe2fd8622aad1..26b2dff50644eb60d0b0b629b973df4353eb5303 100644 (file)
--- a/media-libs/allegro/allegro-5.0.11.ebuild
+++ b/media-libs/allegro/allegro-5.0.11.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-multilib
 
 DESCRIPTION="A game programming library"
@@ -13,9 +14,17 @@ SLOT="5"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal oss physfs png pulseaudio test truetype vorbis X xinerama"
 
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+RDEPEND="
+       >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+       >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+       >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+       >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+       >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        dumb? ( >=media-libs/dumb-0.9.3-r2[${MULTILIB_USEDEP}] )
        flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
+       gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
        jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
        openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
        physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
@@ -23,18 +32,12 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
        truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
        vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
-       >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-       >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-       >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-       gtk? ( >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}] )
-       >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-       >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-       xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-
+       xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-       x11-base/xorg-proto"
+       x11-base/xorg-proto
+"
 
 PATCHES=( "${FILESDIR}"/${P}-{underlink,multilib}.patch )
 
@@ -42,32 +45,32 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_want alsa)
+               -DWANT_ALSA=$(usex alsa)
                -DWANT_DEMO=OFF
                -DWANT_EXAMPLES=OFF
-               $(cmake-utils_use_want flac)
-               $(cmake-utils_use_want jpeg IMAGE_JPG)
-               $(cmake-utils_use_want png IMAGE_PNG)
-               $(cmake-utils_use_want dumb MODAUDIO)
-               $(cmake-utils_use_want openal)
-               $(cmake-utils_use_want oss)
-               $(cmake-utils_use_want physfs)
-               $(cmake-utils_use_want pulseaudio)
-               $(cmake-utils_use_want test TESTS)
-               $(cmake-utils_use_want truetype TTF)
-               $(cmake-utils_use_want vorbis)
-               $(cmake-utils_use_want gtk NATIVE_DIALOG)
-               $(cmake-utils_use_want X opengl)
-               $(cmake-utils_use_want xinerama X11_XINERAMA)
+               -DWANT_FLAC=$(usex flac)
+               -DWANT_IMAGE_JPG=$(usex jpeg)
+               -DWANT_IMAGE_PNG=$(usex png)
+               -DWANT_MODAUDIO=$(usex dumb)
+               -DWANT_OPENAL=$(usex openal)
+               -DWANT_OSS=$(usex oss)
+               -DWANT_PHYSFS=$(usex physfs)
+               -DWANT_PULSEAUDIO=$(usex pulseaudio)
+               -DWANT_TESTS=$(usex test)
+               -DWANT_TTF=$(usex truetype)
+               -DWANT_VORBIS=$(usex vorbis)
+               -DWANT_NATIVE_DIALOG=$(usex gtk)
+               -DWANT_OPENGL=$(usex X)
+               -DWANT_X11_XINERAMA=$(usex xinerama)
        )
 
        cmake-multilib_src_configure
 }
 
 src_install() {
+       local HTML_DOCS=( docs/html/refman/. )
        cmake-multilib_src_install
 
        dodoc CHANGES-5.0.txt
-       dohtml -r docs/html/refman/*
        doman docs/man/*.3
 }

diff --git a/media-libs/allegro/files/allegro-5.0.11-multilib.patch b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
index ffb0c25fc8b60534e3ac64b762aed40f63f52d93..8cd1dc1037b32528f01f78ab90b888f0ee5745f0 100644 (file)
--- a/media-libs/allegro/files/allegro-5.0.11-multilib.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-multilib.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2013-06-16 10:16:08.000000000 +0600
-+++ CMakeLists.txt     2016-02-25 14:32:40.350446191 +0500
+--- a/CMakeLists.txt   2013-06-16 10:16:08.000000000 +0600
++++ b/CMakeLists.txt   2016-02-25 14:32:40.350446191 +0500
 @@ -560,7 +560,6 @@
  endif(SUPPORT_X11 AND NOT SUPPORT_OPENGL)
  

diff --git a/media-libs/allegro/files/allegro-5.0.11-underlink.patch b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
index 7702c1d2c6dbbe693d47df6b039ef68c3c71eb48..1e0b502ed3e49376855566afa061c6bef994fedf 100644 (file)
--- a/media-libs/allegro/files/allegro-5.0.11-underlink.patch
+++ b/media-libs/allegro/files/allegro-5.0.11-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old 2011-06-06 23:56:09.367125536 +0200
-+++ CMakeLists.txt     2011-06-06 23:56:19.311748807 +0200
+--- a/CMakeLists.txt   2011-06-06 23:56:09.367125536 +0200
++++ b/CMakeLists.txt   2011-06-06 23:56:19.311748807 +0200
 @@ -703,7 +703,7 @@
  
  if(ALLEGRO_UNIX) # not MACOSX