gentoo resync : 04.05.2018

4 files changed, 54 insertions, 56 deletions

diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index 7124d3c1ef1a..7cf7cebecb57 100644
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,4 +1,4 @@
-AUX lightyears-1.4-gentoo.patch 1276 BLAKE2B afa822f2840070097644fdf6f6b6c25ba88dff59ef9a6fdc7b578aed266ea60f8dd797f7ae705e28d9bbfa65b9ca7fcf60af2b511b95890486779f8649df1866 SHA512 3388a5bbb384cbaaef29776f3f05c789df8955a86ead9ccb88dbcc48c623ae16a3cb2c498c48db49e87f57ae8a8bd174219ae14cb848903394331bb4635f0b61
+AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
 DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r1.ebuild 1110 BLAKE2B 0bbaa058ca140091bc57a0ccd15a26c08705dab81339eefa02a255195a3cb08a88c2ae062d30388ef968d9f0b36eb93bf0534e0e64bcd00387e164f8a213c3ae SHA512 29d991cfd0261ec7f7441e13afbd23e9e85861009ee5f74ea069a894c7a87971cf69328da8535a2989a6be71696953806d47266d106a150b81c8dcb708245824
+EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
 MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
index 063dbab3c1e8..325c4365ded4 100644
--- a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
+++ b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
@@ -1,5 +1,5 @@
---- lightyears
-+++ lightyears
+--- a/lightyears
++++ b/lightyears
 @@ -1,7 +1,6 @@
  #!/usr/bin/python
  
diff --git a/games-strategy/lightyears/lightyears-1.4-r1.ebuild b/games-strategy/lightyears/lightyears-1.4-r1.ebuild
deleted file mode 100644
index 2215ab7dc4a0..000000000000
--- a/games-strategy/lightyears/lightyears-1.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="a single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "$(games_get_libdir)/${PN}"
-	doins code/*.py
-
-	dodoc README.txt
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${D}$(games_get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-	prepgamesdirs
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
new file mode 100644
index 000000000000..7e7344951fc2
--- /dev/null
+++ b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="A single-player game with a science-fiction theme"
+HOMEPAGE="http://www.jwhitham.org/20kly/"
+SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
+		${PN} || die
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/"$(get_libdir)/${PN}"
+	doins code/*.py
+
+	einstalldocs
+
+	insinto "/usr/share/${PN}"
+	doins -r audio data manual
+
+	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
+
+	newicon data/32.png ${PN}.png
+	make_desktop_entry ${PN} "Light Years Into Space"
+}