gentoo resync : 25.11.2020

4 files changed, 30 insertions, 50 deletions

diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index b41a13fedce0..6322c047f852 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1,4 +1,3 @@
-AUX lmarbles-1.0.8-gentoo.patch 560 BLAKE2B e4eb5153feb40d53ac831fc7f53e5673a49a546f9ee8b4020f8fabc9643661f78e74ed12756409598f2e25def084376cbab762dc534d0243270110fa48efaee6 SHA512 158a253d346fc5bec9eb8ecdd8541df04fdd9946bc2f59d7404e5ae08415a161079f38697ecfde2b22065708c8704b2fd9232f13872c394ab8274063166d0d41
 DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
-EBUILD lmarbles-1.0.8.ebuild 714 BLAKE2B 5cdfb7482198c8c1c03b77fb9f20d8a9ea5a8c46af804c06080d6da2a451c19685f169ede54b0a443693eb55e83ae6037f7bcae47b3a6b6676602c16b9cc8d87 SHA512 172643957b074d7b285b69c2e477493584e9fb2b57542f02a2d0accd32083c596dd746031b8b78302dec1d266c7bc799973c52f775a230e7fa7099d417bf1d7c
+EBUILD lmarbles-1.0.8-r1.ebuild 589 BLAKE2B b4f0fbf0aa4d778e05352f1d9f5a37d0a8e914a2af18819f5a445c59243ca0fe0cc19a61ad13c18654dd4c7c0bcd7ceef8ebe99471c292d78d55dda71c6a9503 SHA512 f3efb10c8c5f95784631146a87b7edd04ab4d4aad1b0189bf08778cd600c57e9e662dea0de1b987b19f9a89a5ff7f80fb9fa857a830e4fe49b0d235466058efc
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch b/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
deleted file mode 100644
index 160b6d0f79d5..000000000000
--- a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru lmarbles-1.0.8.orig/Makefile.am lmarbles-1.0.8/Makefile.am
---- lmarbles-1.0.8.orig/Makefile.am	2009-10-26 16:01:08.000000000 -0400
-+++ lmarbles-1.0.8/Makefile.am	2009-11-07 13:23:55.994140203 -0500
-@@ -4,11 +4,6 @@
- README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif \
- lmarbles.desktop.in
- 
--desktopdir = $(datadir)/applications
--desktop_DATA = lmarbles.desktop
--icondir = $(datadir)/icons
--icon_DATA = lmarbles48.gif
--
- AUTOMAKE_OPTIONS = foreign
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt TODO marbles.spec
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..e92811a4437c
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
+SRC_URI="https://download.sourceforge.net/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	default
+	dodoc src/manual/*
+
+	fperms 660 /var/lib/lmarbles.prfs
+	fowners root:gamestat /var/lib/lmarbles.prfs
+}
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
deleted file mode 100644
index 59381278471a..000000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv configure.{in,ac}
-	rm *.m4
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon lmarbles48.gif ${PN}.gif
-	make_desktop_entry lmarbles LMarbles /usr/share/pixmaps/${PN}.gif
-	dohtml src/manual/*
-	prepgamesdirs
-}