gentoo resync : 12.01.2019

3 files changed, 155 insertions, 0 deletions

diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 5b0b87353e9c..6a7ec58c85dd 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,5 +1,6 @@
 AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
 AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
+AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49bd650fe065b2ccc4f9ee70a191b8fc22f3fe2501b54ac8fb2dbdb4630958f68585895c4f813a67495690a8d830d4879 SHA512 8783c04c765c3f28afd0b94603056e4a28a968f329f8814f60b074327dbd0f22e0e124df17223f04f840fdbdb5db7c9b868ccb90062902699df44b59c3b91060
 AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
 AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
 AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
@@ -9,6 +10,7 @@ DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee039
 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-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-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
new file mode 100644
index 000000000000..19cd6bed639b
--- /dev/null
+++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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
+	"${FILESDIR}"/${P}-glibc228.patch               # bug 670781
+)
+
+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/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
new file mode 100644
index 000000000000..afcdf5100c5e
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
@@ -0,0 +1,41 @@
+From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <andreas@ronnquist.net>
+Date: Wed, 12 Dec 2018 16:39:23 +0100
+Subject: [PATCH] Remove f* variants of fixed math functions
+
+Removing functions that conflicts with later glibc implementations,
+people should use fix* variants instead.
+(Simply use fixadd instead of fadd).
+---
+ include/allegro/alcompat.h | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
+index d31ab5b6d..c9536839d 100644
+--- a/include/allegro/alcompat.h
++++ b/include/allegro/alcompat.h
+@@ -40,24 +40,6 @@
+       #endif
+    #endif
+ 
+-   #ifndef ALLEGRO_NO_FIX_ALIASES
+-      AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
+-      AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
+-      AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
+-      AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
+-      AL_ALIAS(int fceil(fixed x), fixceil(x))
+-      AL_ALIAS(int ffloor(fixed x), fixfloor(x))
+-      AL_ALIAS(fixed fcos(fixed x), fixcos(x))
+-      AL_ALIAS(fixed fsin(fixed x), fixsin(x))
+-      AL_ALIAS(fixed ftan(fixed x), fixtan(x))
+-      AL_ALIAS(fixed facos(fixed x), fixacos(x))
+-      AL_ALIAS(fixed fasin(fixed x), fixasin(x))
+-      AL_ALIAS(fixed fatan(fixed x), fixatan(x))
+-      AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
+-      AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
+-      AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
+-   #endif
+-
+ #endif  /* !defined ALLEGRO_SRC */
+ 
+