gentoo resync 31.01.2019

3 files changed, 2 insertions, 114 deletions

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 6a7ec58c85dd..a97581ad1bff 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -9,8 +9,7 @@ AUX allegro-5.0.11-underlink.patch 390 BLAKE2B 9e28af560d359d1ef2e2a13ac30ede196
 DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
 DIST allegro-5.0.11.tar.gz 3203777 BLAKE2B b8946e58cde38fdf52f42e041fb27ea92e9589f3425c8047afa4d66ca466cb294e6c8efdc03f0e6942f665e4624c10e533a64bc77bcfaf132662b2123b97de34 SHA512 bcf3bec236d5dee11c789394144959d2a2f6028ae3d89a91a726f796d74f785c7f28749ac1cda94becaf18c31c76fcf75b8f2f6d1f2c32c52d556f967a406052
 DIST allegro-5.2.4.0.tar.gz 7822903 BLAKE2B 50538e27276fbe1572a660b3f1396bdb9b542dc2aafaa819a4108e0e2771731cb6924cf1d0b7a7bfea1ff5c12b4772ff58dc571c81bb6a601d31a2083f5f9bea SHA512 c5f80191005165331635464ffd345369943d37dcb55345176a7171614e12826b25d9d74ab656333302d6682d404f1b46a5d94c0dd23d7873151e6e488d62c776
-EBUILD allegro-4.4.2-r1.ebuild 2527 BLAKE2B 232f6a17a76131b75fb9c5251504715a5bb74c084ef23cfe29fdceefe8927a3a5cacb5840f9767139b50b0a8a4842e13ef2a8226afbef096d61b5980cb917508 SHA512 af76323c8fb530e1140dcc20ac37138210634593a416e7dd45090f8641473b2b7e3aaf5cc3e068b5a74c92e8f0ef86aa04a92ed16213aa52486abf7643b9dd47
-EBUILD allegro-4.4.2-r2.ebuild 2590 BLAKE2B 11772937e0a9b43f9ed52a26467ac5ac219caaca7f2171df009bf33047d0596750c9ee2a92b3cb322a49bcac5067ae43e5d696b88cb020fca82773a0f5ba07ba SHA512 9929afa8ea5647e957ee1070b304fb1ac0532a9261569c93d29addfcc6a9fd342249cdcd0d4595cdce6862c6dae8109b6096481c5ddb4e04e0ab4b07e2f68252
+EBUILD allegro-4.4.2-r2.ebuild 2586 BLAKE2B 9436548344a878ee11ffdd2fd20c6f7c6f7157ee1c8f73f9d55e376d386fb8fdbaa5a1178c3bfff2e0fecc9c83ec0275b9883935354746277c4ec0970e2090ea SHA512 8ca49bd5e811faa9e707cb0af64c07857286f6af9f962adc97ae33d3c267e996010bd4f3ce76faa99414ce922f6eb6bb123b9671da388019c8109ee6f8805fa0
 EBUILD allegro-5.0.11.ebuild 2397 BLAKE2B 1477ed40dc61ac329d85893dca32fa4d9c805c7dc0254e22fbda6a25c9b84907634bf83a24aebb113fe28f548311b547a60be6a9a54f32560935f2b36927d851 SHA512 a4663c4c33f07b9f5b58ede35e369107d3585b9489150c50c3cc312a6ae61e12e0a023b19208c53c2dea2fbff4fdf285fd7962afa30d6ad1ba5c55b40e760719
 EBUILD allegro-5.2.4.0.ebuild 2704 BLAKE2B 00be6767ea9561888a856b5645d62b50b35d52881cfa39e0914e60bffb55409db6eb9c81280deb14307140527830428eb638221dee672eb545912946b04479a4 SHA512 6ed0efe4520dada386b2bf29b660696606afe69a723f64f699980a103e5a4b3206724dee9f4c6c77e43009146747973880ad96610cf410b6f5c698904d6a61e6
 MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
diff --git a/media-libs/allegro/allegro-4.4.2-r1.ebuild b/media-libs/allegro/allegro-4.4.2-r1.ebuild
deleted file mode 100644
index 06ed3de8d269..000000000000
--- a/media-libs/allegro/allegro-4.4.2-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop
-
-DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-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"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	svga? ( media-libs/svgalib )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-		opengl? (
-			virtual/glu
-			virtual/opengl
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? ( x11-base/xorg-proto )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-shared.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-rpath.patch
-	"${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
-		docs/CMakeLists.txt || die
-}
-
-src_configure() {
-	# WANT_LINUX_CONSOLE is by default OFF
-	# WANT_EXAMPLES doesn't install anything
-	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+=( -DWANT_ALLEGROGL=$(usex opengl) )
-	else
-		mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	rm -r docs/html/{build,tmpfile.txt} || die
-	local HTML_DOCS=( docs/html/. )
-
-	cmake-utils_src_install
-
-	#176020 (init_dialog.3), #409305 (key.3)
-	pushd docs/man >/dev/null
-	local manpage
-	for manpage in $(ls -d *.3); do
-		newman ${manpage} ${PN}-${manpage}
-	done
-	popd >/dev/null
-
-	if use X; then
-		newbin setup/setup ${PN}-setup
-		insinto /usr/share/${PN}
-		doins {keyboard,language,setup/setup}.dat
-		newicon misc/icon.png ${PN}.png
-		make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
-	fi
-}
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
index 19cd6bed639b..5797f5829b3f 100644
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
 
 LICENSE="Allegro MIT GPL-2+ ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
 
 RDEPEND="