diff options
Diffstat (limited to 'games-puzzle/xbomb')
| -rw-r--r-- | games-puzzle/xbomb/Manifest | 6 | ||||
| -rw-r--r-- | games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch | 61 | ||||
| -rw-r--r-- | games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch | 4 | ||||
| -rw-r--r-- | games-puzzle/xbomb/xbomb-2.2b-r1.ebuild (renamed from games-puzzle/xbomb/xbomb-2.2b.ebuild) | 41 |
4 files changed, 60 insertions, 52 deletions
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest index bc88916ffec3..6c0fb2120767 100644 --- a/games-puzzle/xbomb/Manifest +++ b/games-puzzle/xbomb/Manifest @@ -1,5 +1,5 @@ -AUX xbomb-2.2b-DESTDIR.patch 871 BLAKE2B 4a6841b33ce4cbfdf17507d8fe5001d82fa4de026693eb898b915c22b9779bf83e279a3add9fdba67ae8614cd42df5fc81f686016437184e7d529290fd2ce2fd SHA512 98135eb5927b4bd92bc1a6ac6fb86bf8c1f7387949c1ac419e3f78cc84184e1c8b2b8b6fb5d23089b6fdd8a7a8dca05733821180d1316d30edc53f487a16e4c8 -AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B 2b22fe367177a8551fc692e97de539be366da981c79f31646bfc8dc5cf98bafdc916d9d89af3e44773e1a4c54bb35700cee1d093dee0233a639a6a6c4849b814 SHA512 21c7d9c57ec972ae49dd20a94041378a53dcd310685c8c3755571243d51b0b0e1664b30c0ce9013ad289d8589e7e219bafdcbcc31503ccc25052f2c3dbc2df82 +AUX xbomb-2.2b-DESTDIR.patch 706 BLAKE2B 257023ee9127df592b81c7e4cb24b2004cd1522f89766ac8a6ee094889567278f59b2c17faca7f00954fb5021762ebdd593fb0e253f54c2b83546e4b5f83c0e8 SHA512 be770c9dd42e7c802af60ebe019b359d12b74397956d32881504b20f8ad44994a3cf1dcd3e23fcf65642cbee1aa622ba2fff63ec223fce9faaef0c03ed4b1914 +AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B b43eab3cf0fdbabce44b2ec6c2f47db947cb857e46620a4d4b5d2d30da07a0ee169e54403854f54a755e7569d37d9a43948ebf6bdb35611a0cbc8f415d2507dc SHA512 047f410f34505d4582969f071eb1982fd3bb38357ad228e61608ca9307118263f34d6a1b43832877ca2862e107018132bad3bf6e3df79b641d5466efb94a6d8c DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1 -EBUILD xbomb-2.2b.ebuild 1001 BLAKE2B 0d0a6b3342161c22217f9cf868f8854002aa13bf7666f2e78b45ea02908a4cf6fe03b5594d303f0b9a8667045e2bffdf3447649032ee0afe08bb1278af44d15c SHA512 05d114f256b1a641714848d96df47faeaa64396e670a95d376ca32eea4b0c2f59d6246454a23bf301aa010938bde8af758fe3c90a3f6b2ee4a354bd72fe65e6a +EBUILD xbomb-2.2b-r1.ebuild 1052 BLAKE2B 27f4468551b7bba3af241bfcef1197a10bc9df2690c299403c0e135b6b08ecb59219f2249e23d47e4ca2ceb75430461cc78d4a2ce1cd3aa55d8d7b4b5659068f SHA512 5a2386b5107289a488972561ab5908b33a39e851e21b1b7db927528d6c79f26d7b0fdbae7da35e681ef8ded2e846ac8cfbd19d2456c6d5cae56981a8a3e1b5a7 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch index 2ee8edd4ec91..6f45b4c82fa2 100644 --- a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch +++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch @@ -1,34 +1,27 @@ -*** xbomb-2.1/Makefile 1996-01-20 16:02:46.000000000 -0500 ---- xbomb-2.1.new/Makefile -*************** -*** 27,34 **** - - OBJ=xbomb.o xwindow.o hiscore.o - -- INSTDIR=/usr/local -- - ######## - - xbomb : $(OBJ) ---- 27,32 ---- -*************** -*** 52,60 **** - - install : - strip xbomb -! install -d $(INSTDIR)/bin -! install -d $(INSTDIR)/man/man6 -! install -d $(INSTDIR)/lib/app-defaults -! install -m 755 xbomb $(INSTDIR)/bin -! install -m 644 xbomb.6 $(INSTDIR)/man/man6 -! install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb ---- 50,58 ---- - - install : - strip xbomb -! install -d $(DESTDIR)/usr/bin -! install -d $(DESTDIR)/usr/share/man/man6 -! install -d $(DESTDIR)/etc/X11/app-defaults -! install -m 755 xbomb $(DESTDIR)/usr/bin -! install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6 -! install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb +--- a/Makefile ++++ b/Makefile +@@ -27,8 +27,6 @@ + + OBJ=xbomb.o xwindow.o hiscore.o + +-INSTDIR=/usr/local +- + ######## + + xbomb : $(OBJ) +@@ -52,9 +50,9 @@ + + install : + strip xbomb +- install -d $(INSTDIR)/bin +- install -d $(INSTDIR)/man/man6 +- install -d $(INSTDIR)/lib/app-defaults +- install -m 755 xbomb $(INSTDIR)/bin +- install -m 644 xbomb.6 $(INSTDIR)/man/man6 +- install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb ++ install -d $(DESTDIR)/usr/bin ++ install -d $(DESTDIR)/usr/share/man/man6 ++ install -d $(DESTDIR)/etc/X11/app-defaults ++ install -m 755 xbomb $(DESTDIR)/usr/bin ++ install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6 ++ install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch index a320b0900c53..9f1f524b33cf 100644 --- a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch +++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.old -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -30,7 +30,7 @@ ######## diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild index 488c4de4bd50..d717dc1dcef8 100644 --- a/games-puzzle/xbomb/xbomb-2.2b.ebuild +++ b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 + +inherit desktop toolchain-funcs DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/" @@ -11,30 +12,44 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="" DEPEND="x11-libs/libXaw" -RDEPEND=${DEPEND} +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" + +PATCHES=( + "${FILESDIR}"/${P}-DESTDIR.patch + "${FILESDIR}"/${P}-ldflags.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-DESTDIR.patch \ - "${FILESDIR}"/${P}-ldflags.patch + default + sed -i \ -e '/strip/d' \ -e '/^CC=/d' \ -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \ - -e "s:/usr/bin:${GAMES_BINDIR}:" \ Makefile || die sed -i \ - -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \ + -e "s:/var/tmp:/var/lib/${PN}:g" \ hiscore.c || die } +src_configure() { + tc-export CC +} + src_install() { default - dodir "${GAMES_STATEDIR}"/${PN} - touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed" - fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi + + dodir /var/lib/${PN} + touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed" + fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi + + fowners root:gamestat /var/lib/${PN} + fperms g+s /usr/bin/${PN} + make_desktop_entry xbomb XBomb - prepgamesdirs } |