gentoo resync : 15.12.2019

4 files changed, 5 insertions, 91 deletions

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 89b1a601fc06..c0e45cf4bf28 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -7,9 +7,7 @@ AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa7
 AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
-DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
 DIST allegro-5.2.5.0.tar.gz 7849326 BLAKE2B 8d8995b9ad252b81c534099ffd91d81bbdcf4a34f7ca7c4fb7dd97e5c075869c212fa68445a5fe479a675d755ad0414976c11cbc112ecdd61f1fa09704957b21 SHA512 c6341396ad7340233c1297ed122095e5c2d129a32da2350b4bb39c4b74f8d56d57ec4e608defec471d63fff51d786f0a9f3844be82f81cdb3d48d5bc49908b12
-EBUILD allegro-4.4.2-r2.ebuild 2710 BLAKE2B e3355fae46eaeed67fd426adaffd704db607e2d5d3e0b5f158c131ea5034f7003e41e52772525d0e29d859c5a7788bcbc253a60208e6632d0cc9c0e236b2fe92 SHA512 2bb250aabb2a1d048ac2a0bb2fd9dfa3774a23539488ef9d79187bfb33e67c6aedcec6386b052d41047b625d0f06bd0328e8e3426cf7e8eeb742845ce25bacd4
-EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
-EBUILD allegro-5.2.5.0.ebuild 2792 BLAKE2B c68cd10374a280e4e230954b1843c3e0c5d5c3854da9c7309bb7ffeaffeae8d8c69938aefb4dd3cec619f3de54da34b3d4b5aeb5a49da9696827cd395591bddd SHA512 d9771f255e1ce41b34c0c880bbcc8fed5ad81101b0beb57b2fa0d27dc648f73450de07376b08e9ccfb1bb2c28e278bfdd2889c1fe815995898b465b693c36d75
+EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
+EBUILD allegro-5.2.5.0.ebuild 2815 BLAKE2B f9e0fa04cef9144f57076184248d86aa7a2db28e2c3bb31c34abb7f3a06d1f6130bfc45e041293378b42854fbefdf0cf9718d709b7b1e73b79365d76ddfebf11 SHA512 09fd35132056411a1e45080ecf97563f52df1bcfadc2557d72dc954fbebe27f352cb7d11c54824063a8335fcf6a3f3866b00d52f43123c2b1eacec6373b981f0
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 08dd7f1068c6..0387f700f4a8 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -14,6 +14,7 @@ LICENSE="Allegro MIT GPL-2+ ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-libs/allegro/allegro-5.2.4.0.ebuild b/media-libs/allegro/allegro-5.2.4.0.ebuild
deleted file mode 100644
index ec269bd77e84..000000000000
--- a/media-libs/allegro/allegro-5.2.4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Cross-platform library aimed at video game and multimedia programming"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD ZLIB"
-SLOT="5"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
-
-REQUIRED_USE="X? ( opengl ) xinerama? ( X )"
-
-RDEPEND="
-	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}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[${MULTILIB_USEDEP}] )
-	physfs? ( >=dev-games/physfs-2.0.3-r1[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.5.18:0=[${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}] )
-	webp? ( media-libs/libwebp:0=[${MULTILIB_USEDEP}] )
-	X? (
-		>=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}]
-	)
-	xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	x11-base/xorg-proto
-"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/allegro5/allegro_native_dialog.h )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_DEMO=OFF
-		-DWANT_EXAMPLES=OFF
-		-DWANT_FLAC=$(usex flac)
-		-DWANT_IMAGE_JPG=$(usex jpeg)
-		-DWANT_IMAGE_PNG=$(usex png)
-		-DWANT_MODAUDIO=$(usex dumb)
-		-DWANT_NATIVE_DIALOG=$(usex gtk)
-		-DWANT_OPENAL=$(usex openal)
-		-DWANT_OPENGL=$(usex opengl)
-		-DWANT_OPUS=$(usex opus)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PHYSFS=$(usex physfs)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_TESTS=$(usex test)
-		-DWANT_TTF=$(usex truetype)
-		-DWANT_OGG_VIDEO=$(usex vorbis)
-		-DWANT_VORBIS=$(usex vorbis)
-		-DWANT_IMAGE_WEBP=$(usex webp)
-		-DWANT_X11=$(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
-	doman docs/man/*.3
-}
diff --git a/media-libs/allegro/allegro-5.2.5.0.ebuild b/media-libs/allegro/allegro-5.2.5.0.ebuild
index 355077dbfb22..be007eeb7fb5 100644
--- a/media-libs/allegro/allegro-5.2.5.0.ebuild
+++ b/media-libs/allegro/allegro-5.2.5.0.ebuild
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/liballeg/allegro5/releases/download/${PV}/${P}.tar.g
 
 LICENSE="BSD ZLIB"
 SLOT="5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa dumb flac gtk jpeg openal opengl opus oss physfs png pulseaudio test truetype vorbis webp X xinerama"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="X? ( opengl )
 	xinerama? ( X )