gentoo resync : 28.04.2018

5 files changed, 54 insertions, 131 deletions

diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest
index 472a29fb42ce..da538154885b 100644
--- a/games-engines/love/Manifest
+++ b/games-engines/love/Manifest
@@ -1,7 +1,6 @@
 AUX love-0.8.0-freetype2.patch 823 BLAKE2B 1927b092c6a107aa034b65bc4fc665f711b6070f44901ae9b402734c7339d07b39989651d729f91901efce50d9e2c5ccbe5f8a84fe8a8f72b455c2e3243fbe82 SHA512 fb4326f474b403cd3ec0bf679b4177dae070faf91848825c75800a2adb5ca1c91d26a555b61f7b031632fd64f50b239bfabb2967cb5e1d7ca1a249544faa0142
 DIST love-0.7.2-linux-src.tar.gz 900209 BLAKE2B abd0db98d210c5523d3b5a75c30bcfa2fc9d7760c7642d08dda28690ab72ddf8a0c7b60793cd7b0f902a8e3fcf2750748c75caf29638a7455572d84683be7820 SHA512 cbca1d7e3425d1ecbdae019212dfa2814d8ac3bad1faedd4b052cf3e89b5bf2fac6e422283628e4c125858c9db050dee2129476d1a73ec44ffe8a4704f170f61
 DIST love-0.8.0-linux-src.tar.gz 1027356 BLAKE2B bfbc2f9a3d5c3beffb4790a69716416815534c3b390b1554722eceaec57a7530377c06c15c6551aa972b33176bccdadfc8ad12bc186ceda201527bd9f8286d6f SHA512 6a0e28d102b950d3dddf7101996fe0ad04dfd7d4ec5e58797b41ef3382b60e74f90c6e707f882cf43cc0c5cc98703857eefc6418e6a6fd34e88f8019143f55a4
-EBUILD love-0.7.2-r1.ebuild 925 BLAKE2B e8a9e5abd0aa4030604efd202f0fd6598372a85afaf2a418312c8622f612627cbf7ff3a805c09e1059654182e8693ab69ea7cf76796170b85d718104cbb6c3f3 SHA512 d195a330178a6a1cbdea75c5512310c3cbcebc785ed500ca38c0150ae445295c2c12dace644a28f0b975b622c59365871da9be2c6a9c9baeefc906777f28fd53
-EBUILD love-0.8.0.ebuild 1158 BLAKE2B 1d951d9981eb17a6419d241b91a18752e1f26b808be4e5e2bdade084fff60f551707d98da477da02d86fa4a35a4ef3fbc082d2124e15d6f0a1785be3fd1f9c79 SHA512 157e6b5efbd95d8921fb67aaa33c50e7c57068ae4fc0fc010a95e45329fca4a48f3de1550957a326731f01a5d691b97c2feeb060429206d99881a9088b73c09b
-EBUILD love-9999.ebuild 1203 BLAKE2B 4f7a9d49959b8b2db2ee66a5a33b408b3ae57c163b547e411e7e96f2c86b8b3c1240e80114323938599dc862d3f71cc650aefb0e80f20ebf7997b937b683210c SHA512 e3707435e698dee938bba065262618bc5fd24a366e1481f9b205c31b9b5042f495f04776fe1b42020ac4914d302949136914b009f0320c1c51bc18c6cf0e7866
+EBUILD love-0.7.2-r2.ebuild 848 BLAKE2B 7ad7ad32850328b502c106714b1a8074122d429b5536333957b80b45e597536981a8569c6735078f34a8412c068a6a19fcb23953b4798c19abcc98a6cc6c259e SHA512 db2c45809a19d7b3f30ec8772d1208d449ca8e5c121a30bcc92e1ffba35d13f801fb8c0f622867314c164b3dc0b61679cf234e73266536b3322d1139a5ce7685
+EBUILD love-0.8.0-r1.ebuild 758 BLAKE2B d8462edf603283285d463ad560a59c8c985f31ea82ca0604b91269cac150ef84575d03a6dc0df0563abd3aefafb2b37dafe3291e36c5846bb6e8936a82003015 SHA512 e4d045bd0d071011500500748cb6b82b3b9b4aebbd252b2a16a87e1c8aa01c74f69a22caaf366b89aebf31ded5e31d22a2e9ca7abb141b31b27f00b255ab2d51
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/games-engines/love/love-0.7.2-r1.ebuild b/games-engines/love/love-0.7.2-r2.ebuild
index eeb49f5034c4..e29f78d0863e 100644
--- a/games-engines/love/love-0.7.2-r1.ebuild
+++ b/games-engines/love/love-0.7.2-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
 
 DESCRIPTION="A framework for 2D games in Lua"
 HOMEPAGE="http://love2d.org/"
@@ -13,31 +12,30 @@ SLOT="0.7"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-games/physfs
-	dev-lang/lua[deprecated]
+RDEPEND="
+	dev-games/physfs
+	dev-lang/lua:0[deprecated]
 	media-libs/devil[mng,png,tiff]
-	media-libs/freetype
+	media-libs/freetype:2
 	media-libs/libmodplug
 	media-libs/libsdl[joystick,opengl]
 	media-libs/libvorbis
 	media-libs/openal
 	media-sound/mpg123
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	media-libs/libmng
-	media-libs/tiff"
+	media-libs/libmng:0
+	media-libs/tiff:0
+"
 
-S=${WORKDIR}/${PN}-HEAD
+S="${WORKDIR}/${PN}-HEAD"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.0-freetype2.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.8.0-freetype2.patch )
 
 src_install() {
 	DOCS="readme.txt changes.txt" \
 		default
-	if [[ "${SLOT}" != "0" ]]; then
-		mv "${ED}${GAMES_BINDIR}"/${PN} \
-			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die
-	fi
+
+	mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
 }
diff --git a/games-engines/love/love-0.8.0-r1.ebuild b/games-engines/love/love-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..4545622486fc
--- /dev/null
+++ b/games-engines/love/love-0.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A framework for 2D games in Lua"
+HOMEPAGE="http://love2d.org/"
+SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-games/physfs
+	dev-lang/lua:0[deprecated]
+	media-libs/devil[mng,png,tiff]
+	media-libs/freetype:2
+	media-libs/libmodplug
+	media-libs/libsdl[joystick,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-sound/mpg123
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	media-libs/libmng:0
+	media-libs/tiff:0
+"
+
+PATCHES=( "${FILESDIR}"/${P}-freetype2.patch )
+
+src_install() {
+	DOCS="readme.md changes.txt" \
+		default
+}
diff --git a/games-engines/love/love-0.8.0.ebuild b/games-engines/love/love-0.8.0.ebuild
deleted file mode 100644
index 4f4937e078ce..000000000000
--- a/games-engines/love/love-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-if [[ ${PV} == 9999* ]]; then
-	inherit autotools mercurial
-	EHG_REPO_URI="https://bitbucket.org/rude/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-games/physfs
-	dev-lang/lua[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	media-libs/libmng
-	media-libs/tiff"
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]]; then
-		sh platform/unix/gen-makefile || die
-		mkdir platform/unix/m4 || die
-		eautoreconf
-	fi
-	epatch "${FILESDIR}"/${P}-freetype2.patch
-}
-
-src_install() {
-	DOCS="readme.md changes.txt" \
-		default
-	if [[ "${SLOT}" != "0" ]]; then
-		mv "${ED}${GAMES_BINDIR}"/${PN} \
-			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die
-	fi
-}
diff --git a/games-engines/love/love-9999.ebuild b/games-engines/love/love-9999.ebuild
deleted file mode 100644
index 80ae23fbd24b..000000000000
--- a/games-engines/love/love-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit base games
-
-if [[ ${PV} == 9999* ]]; then
-	inherit autotools mercurial
-	EHG_REPO_URI="https://bitbucket.org/rude/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-games/physfs
-	dev-lang/lua[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	media-libs/libmng
-	media-libs/tiff"
-
-DOCS=( "readme.md" "changes.txt" )
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]]; then
-		sh platform/unix/gen-makefile || die
-		cp platform/unix/Makefile.am . || die
-		cp platform/unix/configure.ac . || die
-		mkdir platform/unix/m4 || die
-		eautoreconf
-	fi
-}
-
-src_install() {
-	base_src_install
-	if [[ "${SLOT}" != "0" ]]; then
-		mv "${ED}${GAMES_BINDIR}"/${PN} \
-			"${ED}${GAMES_BINDIR}"/${PN}-${SLOT} || die
-	fi
-}