gentoo resync : 04.08.2018

6 files changed, 104 insertions, 161 deletions

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 9cb6de54c9a7..51b22ae43812 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,7 +1,4 @@
-DIST imlib2-1.4.10.tar.gz 1016606 BLAKE2B 8d70930d3f4dabb3ead557337ad8eb65ebc84afce40fce97bd1b5bf3e78092d7c7d6c8a3d3604b6d6026cec4b7460a51d966c63a2d4b315c197de233a1205f32 SHA512 e8ba42399773fc8e340b914be4b07bb170ad39ea0840f909cc611ce2372fd2467148f0319aeae1a10b8b4f5ea6b38b1fc1fc68f649d4940b9096a2633a588987
-DIST imlib2-1.4.9.tar.gz 1028872 BLAKE2B 8c92cd9bb5b7ba43412fdb499e35e09f901538ae8beec23ffd96254b303c5ddd3e46c8850221f7ad24a462c9f04daee155878b41d96d602f3c9ca6aac2b1e386 SHA512 303436f447142153928e2d76226b6798c65cb834bf3bfb760e278d2558a3f072ff43fe46616baeea927254200c4535cc323f6a83c5d869def4f6a7213e30e2db
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
-EBUILD imlib2-1.4.10.ebuild 2005 BLAKE2B b0792ae68d5ac1c4d0a17415d4614bfa35b7ea8e4293b55399abc897dbd98f04375efc2e60d349e968ddfd8757614689d2b6dd0b4d8ce18c6e7c882b0d26cdc4 SHA512 fcb939157b9e7d840c00af3700f2e119875bcfbeef2b48bc72aea6a835c66936c747de350894702abc8159c9925b7e6ec4f1c27eb2be773abff3fca396875801
-EBUILD imlib2-1.4.9.ebuild 1988 BLAKE2B 17390f940f2381e276754f332fa6d68e69dd2e34f5edf950c04dbeb62f4e2fec806a7756765f60334b8ee2cb0e7dd4584fb2c46ba533a47cd9e107eb6027669e SHA512 8b2310e639ce77034448dc4d917d5ab67b75c1dc835370f5975ef82e973099bcdef538612ca7ff4a1f32a83c49cd440d24c721a27de4c961ac3fdc60c4fbb92e
-EBUILD imlib2-1.5.1.ebuild 1968 BLAKE2B 51cf776a53f08aa0f55136248c80f980082dd00ce9df5cf549fed7a46e1a97ce2962202267c7874264750e868a8fccca5d8f6866067584808001da1adfb10133 SHA512 7ee47df946294a8ec7b21488c9aa0ecccb325052e87ebca92930899fa2bd4bad8c1f3e0c4653d43f25a75acae85b8f209bb0c879a2fac48c123d6d77bca68e00
-MISC metadata.xml 2445 BLAKE2B 58a14b7c6eeb627113a5a2a4e72c3937b4b74b3ac6e363d8e0f735f25775178ac2aa5bae2ccc6881bc291d220268fc7db85cd33c0ec796ada823c7812c40d10a SHA512 7a6940cd007784b50b010af8d01992ba56bb756f6433e26ae4962ccdfe25efc41ca1b020b7d88f15cb784ba2d8cb39caffd89b727db7b7f7149ecb137dcaae6d
+EBUILD imlib2-1.5.1-r1.ebuild 2103 BLAKE2B a014302a51fc32f7350df239ce57568c3a2da057592012b9052704ec264ff773223f1770835fb7e2b66c4dc0347da2130baa090a76b5c12307efaa12f97ff263 SHA512 696357d7f83070d3cb63970133a7884459f6376b7415a3f78a185061245fe10fe451a73d5e9e32a7cbf851a63b3660265e39e4ba8c14ea08a2bf8f95e34b15d2
+EBUILD imlib2-1.5.1.ebuild 1965 BLAKE2B 7da6e8ba071a76ac60fe4e84482c4755d2c73f6cd5239b72aeaee28937addd59d01b31c0f66b764a780d9159d89d1915a353f096bfa1a5dfb44c3ad7344f7ec0 SHA512 4ab5ded399a3df668baace65b1cecfe410fa25494ccd4e05badeda46ae671dd72891d42940711c3ef2448e18c715cb3d108ab475fc21d0af97007eed448d903c
+MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
diff --git a/media-libs/imlib2/imlib2-1.4.10.ebuild b/media-libs/imlib2/imlib2-1.4.10.ebuild
deleted file mode 100644
index c6cf6140491b..000000000000
--- a/media-libs/imlib2/imlib2-1.4.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs multilib-minimal eutils
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib"
-
-RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.1.6-r3:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	)
-	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )"
-
-multilib_src_configure() {
-	# imlib2 has diff configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	ECONF_SOURCE="${S}" \
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-multilib_src_install() {
-	enlightenment_src_install
-}
diff --git a/media-libs/imlib2/imlib2-1.4.9.ebuild b/media-libs/imlib2/imlib2-1.4.9.ebuild
deleted file mode 100644
index 5f43a4f2b01d..000000000000
--- a/media-libs/imlib2/imlib2-1.4.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-EGIT_SUB_PROJECT="legacy"
-EGIT_URI_APPEND=${PN}
-
-if [[ ${PV} != "9999" ]] ; then
-	EKEY_STATE="snap"
-fi
-
-inherit enlightenment toolchain-funcs multilib-minimal eutils
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="bzip2 gif jpeg cpu_flags_x86_mmx cpu_flags_x86_sse2 mp3 png static-libs tiff X zlib"
-
-RDEPEND="media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	gif? ( >=media-libs/giflib-4.1.6-r3:0=[${MULTILIB_USEDEP}] )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.3-r6:0[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	)
-	mp3? ( >=media-libs/libid3tag-0.15.1b-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )"
-
-multilib_src_configure() {
-	# imlib2 has diff configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		E_ECONF+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	[[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding )
-
-	ECONF_SOURCE="${S}" \
-	E_ECONF+=(
-		$(use_enable static-libs static)
-		$(use_with X x)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with gif)
-		$(use_with zlib)
-		$(use_with bzip2)
-		$(use_with mp3 id3)
-	)
-
-	enlightenment_src_configure
-}
-
-multilib_src_install() {
-	enlightenment_src_install
-}
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..ca27d229d37c
--- /dev/null
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png shm static-libs tiff X zlib"
+
+REQUIRED_USE="shm? ( X )"
+
+RDEPEND="
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
+	jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
+	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	X? ( x11-base/xorg-proto )
+"
+
+multilib_src_configure() {
+	local myconf_imlib2=(
+		$(use_with bzip2)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mp3 id3)
+		$(use_with png)
+		$(use_with shm x-shm-fd)
+		$(use_enable static-libs static)
+		$(use_with tiff)
+		$(use_with X x)
+		$(use_with zlib)
+	)
+
+	# imlib2 has different configure options for x86/amd64 assembly
+	if [[ $(tc-arch) == amd64 ]]; then
+		myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
+	else
+		myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
+	fi
+
+	ECONF_SOURCE="${S}" \
+	econf "${myconf_imlib2[@]}"
+}
+
+multilib_src_install() {
+	V=1 emake install DESTDIR="${D}"
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doc/. )
+		rm "${S}"/doc/Makefile.{am,in} || die
+	fi
+	einstalldocs
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/imlib2/imlib2-1.5.1.ebuild b/media-libs/imlib2/imlib2-1.5.1.ebuild
index 3810890007b8..3cd615595e69 100644
--- a/media-libs/imlib2/imlib2-1.5.1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 gif jpeg mp3 nls png static-libs tiff X zlib"
 
 RDEPEND="
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 1a0d4be94cfd..01e33b1417ed 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  	<email>juippis@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-  	<email>proxy-maint@gentoo.org</email>
-  	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
-Imlib 2 is the successor to Imlib. It is not just a newer version - it is a 
-completely new library. Imlib2 can be installed alongside Imlib 1.x without any 
-problems since they are effectively different libraries - but they Have very 
+	<maintainer type="person">
+		<email>juippis@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="shm">Use MIT shared memory support for X image transfer.</flag>
+	</use>
+	<longdescription>
+Imlib 2 is the successor to Imlib. It is not just a newer version - it is a
+completely new library. Imlib2 can be installed alongside Imlib 1.x without any
+problems since they are effectively different libraries - but they Have very
 similar functionality.
 
 Imlib2 can do the following:
@@ -40,18 +43,18 @@ Imlib2 can do the following:
 * Provide on-the-fly runtime plug-in image loading and saving interface
 * Fastest image compositing, rendering and manipulation library for X
 
-If what you want isn't in the list above somewhere then likely Imlib 2 does not 
-do it. If it does it it likely does it faster than any other library you can find 
-(this includes gdk-pixbuf, gdkrgb, etc.) primarily because of highly optimized 
-code and a smart subsystem that does the dirty work for you and picks up the 
+If what you want isn't in the list above somewhere then likely Imlib 2 does not
+do it. If it does it it likely does it faster than any other library you can find
+(this includes gdk-pixbuf, gdkrgb, etc.) primarily because of highly optimized
+code and a smart subsystem that does the dirty work for you and picks up the
 pieces for you so you can be lazy and let all the optimizations for you.
 
-Imlib 2 can run without a display, so it can be easily used for background image 
-processing for web sites or servers - it only requires the X libraries to be 
-installed - that is all - it does not require an XServer to run unless you wish 
+Imlib 2 can run without a display, so it can be easily used for background image
+processing for web sites or servers - it only requires the X libraries to be
+installed - that is all - it does not require an XServer to run unless you wish
 to display images.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>