[gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/files/, media-libs/allegro/

[Andreas Sturmlechner]

commit:     cc402fa4548fc878e06c5fa778c519feeee27334
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 18:08:18 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 22:25:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc402fa4

media-libs/allegro: 4.4.2-r1 EAPI-6 bump

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-libs/allegro/allegro-4.4.2-r1.ebuild         | 60 +++++++++++-----------
 .../allegro/files/allegro-4.4.2-gentoo.patch       |  4 +-
 media-libs/allegro/files/allegro-4.4.2-rpath.patch |  4 +-
 .../allegro/files/allegro-4.4.2-shared.patch       |  4 +-
 .../allegro/files/allegro-4.4.2-underlink.patch    |  4 +-
 5 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
index 0cb5aac9bf3..c70499bbb40 100644
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils
+inherit cmake-utils desktop
 
 DESCRIPTION="cross-platform multimedia library"
 HOMEPAGE="http://alleg.sourceforge.net/"
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
 
-RDEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0= )
@@ -55,44 +57,40 @@ src_prepare() {
 src_configure() {
 	# WANT_LINUX_CONSOLE is by default OFF
 	# WANT_EXAMPLES doesn't install anything
-
-	mycmakeargs=(
-		"-DDOCDIR=share/doc"
-		"-DINFODIR=share/info"
-		"-DMANDIR=share/man"
-		$(cmake-utils_use_want alsa)
-		"-DWANT_EXAMPLES=OFF"
-		$(cmake-utils_use_want jack)
-		$(cmake-utils_use_want jpeg JPGALLEG)
-		"-DWANT_LINUX_CONSOLE=OFF"
-		$(cmake-utils_use_want fbcon LINUX_FBCON)
-		$(cmake-utils_use_want svga LINUX_SVGALIB)
-		$(cmake-utils_use_want vga LINUX_VGA)
-		$(cmake-utils_use_want png LOADPNG)
-		$(cmake-utils_use_want vorbis LOGG)
-		$(cmake-utils_use_want oss)
-		$(cmake-utils_use_want test TESTS)
-		$(cmake-utils_use_want X TOOLS)
-		$(cmake-utils_use_want X X11)
-		)
+	local mycmakeargs=(
+		-DDOCDIR=share/doc
+		-DINFODIR=share/info
+		-DMANDIR=share/man
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_EXAMPLES=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JPGALLEG=$(usex jpeg)
+		-DWANT_LINUX_CONSOLE=OFF
+		-DWANT_LINUX_FBCON=$(usex fbcon)
+		-DWANT_LINUX_SVGALIB=$(usex svga)
+		-DWANT_LINUX_VGA=$(usex vga)
+		-DWANT_LOADPNG=$(usex png)
+		-DWANT_LOGG=$(usex vorbis)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_TESTS=$(usex test)
+		-DWANT_TOOLS=$(usex X)
+		-DWANT_X11=$(usex X)
+	)
 
 	if use X; then
-		mycmakeargs+=(
-			$(cmake-utils_use_want opengl ALLEGROGL)
-			)
+		mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
 	else
-		mycmakeargs+=(
-			"-DWANT_ALLEGROGL=OFF"
-			)
+		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
 	fi
 
 	cmake-utils_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	rm -r docs/html/{build,tmpfile.txt} || die
+	local HTML_DOCS=( docs/html/. )
 
-	dohtml docs/html/*.html
+	cmake-utils_src_install
 
 	#176020 (init_dialog.3), #409305 (key.3)
 	pushd docs/man >/dev/null

diff --git a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
index 119d9c78950..660a48437e6 100644
--- a/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-gentoo.patch
@@ -1,5 +1,5 @@
---- docs/CMakeLists.txt.old	2012-03-04 20:20:05.566881387 +0100
-+++ docs/CMakeLists.txt	2012-03-04 20:20:50.659714153 +0100
+--- a/docs/CMakeLists.txt	2012-03-04 20:20:05.566881387 +0100
++++ b/docs/CMakeLists.txt	2012-03-04 20:20:50.659714153 +0100
 @@ -71,11 +71,12 @@
      string(REGEX MATCH "[^/]*._tx" basename ${page})
      string(REPLACE "._tx" "" basename ${basename})

diff --git a/media-libs/allegro/files/allegro-4.4.2-rpath.patch b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
index 57bdb6bf8d0..ab646e485d9 100644
--- a/media-libs/allegro/files/allegro-4.4.2-rpath.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-rpath.patch
@@ -1,5 +1,5 @@
---- setup/CMakeLists.txt
-+++ setup/CMakeLists.txt
+--- a/setup/CMakeLists.txt
++++ b/setup/CMakeLists.txt
 @@ -1,3 +1,5 @@
 +set(CMAKE_SKIP_BUILD_RPATH TRUE)
 +

diff --git a/media-libs/allegro/files/allegro-4.4.2-shared.patch b/media-libs/allegro/files/allegro-4.4.2-shared.patch
index 665c03e3120..7b4417d35c1 100644
--- a/media-libs/allegro/files/allegro-4.4.2-shared.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-shared.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -830,7 +830,7 @@
  option(WANT_LOGG "Enable logg" on)
  option(WANT_JPGALLEG "Enable JPGAlleg" on)

diff --git a/media-libs/allegro/files/allegro-4.4.2-underlink.patch b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
index 33dc9d260b2..7e6ea9398c3 100644
--- a/media-libs/allegro/files/allegro-4.4.2-underlink.patch
+++ b/media-libs/allegro/files/allegro-4.4.2-underlink.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt.old	2011-06-06 23:46:06.057320691 +0200
-+++ CMakeLists.txt	2011-06-06 23:46:21.900313261 +0200
+--- a/CMakeLists.txt	2011-06-06 23:46:06.057320691 +0200
++++ b/CMakeLists.txt	2011-06-06 23:46:21.900313261 +0200
 @@ -392,7 +392,7 @@
          message(FATAL_ERROR "Unix port requires pthreads support.")
      endif()