From 34dea8e38f88007799629d0a56b12dec480b1d21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Jun 2021 14:45:01 +0100 Subject: gentoo resync : 20.06.2021 --- games-misc/Manifest.gz | Bin 8780 -> 8784 bytes games-misc/bsd-games/Manifest | 2 +- games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild | 153 ---------------------- games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild | 153 ++++++++++++++++++++++ games-misc/sdljoytest/Manifest | 2 +- games-misc/sdljoytest/sdljoytest-11102003.ebuild | 4 +- 6 files changed, 157 insertions(+), 157 deletions(-) delete mode 100644 games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild create mode 100644 games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild (limited to 'games-misc') diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz index 60092fa87a5d..82926f315b82 100644 Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest index 96fca5aa6018..f04c1688b795 100644 --- a/games-misc/bsd-games/Manifest +++ b/games-misc/bsd-games/Manifest @@ -8,6 +8,6 @@ DIST bsd-games-3.1-verbose-build.patch.gz 4633 BLAKE2B cc75175ac2ef9d476c03bdb08 DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664aa124157bfa01f2c6a76ebdc90128cc676abae83b6d74680b0ad9396d24f1c0d11adcff1f552a3e68717b8cc8f SHA512 3f311e89481913b734a21fc7d0765628637af8251228d5a38349c27cc702c307240e81711785bbd7428e208a142bd07597630d29e97e2c7bf5bd9cac1ebc6ada DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f -EBUILD bsd-games-2.17_p28-r1.ebuild 4691 BLAKE2B 48957fd49d61fc12cb118ef1b63adfd7eba179754431f574f8d1638349a33d41b5b8660406879b77618829999b6d7b48e6f55aa972e53113ead0d3eef4c96a25 SHA512 c1708121adaa36105ae2d528b059d9bd5d46e387b295b029bd2bbea51e3e7a25e39d3acb4a8bb220ce0537ef5a4d6f7868ad15e35ddc8f2cc751d7e36525b97a +EBUILD bsd-games-2.17_p28-r2.ebuild 4692 BLAKE2B 870cb4508d184ede3772dbe890fc146ef0c92d84f7e5db563f52b8087b5caac4c0b0dbf91e6fcc1d910e921624000aad06b3080f5c8026d628d15985cba971f1 SHA512 23d1e06cb44a363e2865563d40b795383e4e824c63e861cd0ac0361c4a0f4f125c3122d2ec1e76dc50bc524b735b8bbfde8f49fae4a37476bcfd70f6af2114d5 EBUILD bsd-games-3.1-r1.ebuild 4614 BLAKE2B 95d35d5e89f0e65d6a3330f8f5654d5a9f04fdf990c02087630c089a7d4e16778e649724447655773d6f21136db226e407d4a4be152b5349041a602d0d8b44b0 SHA512 1384ac7e380994e0429c12ef17ff5f0ab56a6ad62edb5c7a85a90a9f0e9e42526f1616e3438496bc3d63130ff34b71fbbab289178c8d9ef7373ba20351ee8f41 MISC metadata.xml 326 BLAKE2B 264f08d8e1036db642114667e4dd07d5b4212b85c0254c55e2a0ec541b408f7129322dc133cc0bd875714e1535699d067fe0b625048b14ba002744e7269c4b6d SHA512 6e4e98607587faadf0aae1ba28287c2e694ef629b6ce915db751427f8f46c425e7aa120ef5fc978b2a0e4d4e33ad1cb0b0e136b0a0641c555f6471a8c286ccf5 diff --git a/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild deleted file mode 100644 index c98a641fd78d..000000000000 --- a/games-misc/bsd-games/bsd-games-2.17_p28-r1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DEB_PATCH_VER=28 -DESCRIPTION="Collection of games from NetBSD" -HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/" -#SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${PN}-$(ver_cut 1-2).tar.gz" -SRC_URI="http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz" -SRC_URI+=" mirror://debian/pool/main/b/bsdgames/bsdgames_$(ver_cut 1-2)-${DEB_PATCH_VER}.debian.tar.xz" -S="${WORKDIR}/${PN}-$(ver_cut 1-2)" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" - -DEPEND=" - sys-apps/miscfiles - sys-libs/ncurses:0 - !app-misc/banner - !games-misc/wtf - !games-puzzle/hangman -" -RDEPEND=" - ${DEPEND} - acct-group/gamestat -" -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -# Set GAMES_TO_BUILD variable to whatever you want -GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc -backgammon banner battlestar bcd boggle caesar canfield countmail cribbage -dab dm fish gomoku hack hangman hunt mille monop morse -number phantasia pig pom primes ppt quiz rain random robots sail snake -tetris trek wargames worm worms wtf} - -src_prepare() { - local debian_patch_dir="${WORKDIR}"/debian/patches - for patch in $(<"${debian_patch_dir}"/series) ; do - eapply "${debian_patch_dir}"/${patch} - done - - # Additional patches on top of Debian patchset - eapply "${FILESDIR}"/${PN}-2.17-64bitutmp.patch - eapply "${FILESDIR}"/${PN}-2.17-bg.patch - eapply "${FILESDIR}"/${PN}-2.17-gcc4.patch - eapply "${FILESDIR}"/${PN}-2.17-rename-getdate-clash.patch - - default - - # Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652 - sed -i \ - -e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \ - configure || die - - sed -i \ - -e "s:/usr/games:/usr/bin:" \ - wargames/wargames || die - - sed -i \ - -e '/^CC :=/d' \ - -e '/^CXX :=/d' \ - -e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \ - -e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \ - -e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \ - Makeconfig.in || die - - # Used by config.params - export GAMES_BINDIR=/usr/bin - export GAMES_DATADIR=/usr/share - export GAMES_STATEDIR=/var/games - cp "${FILESDIR}"/config.params-gentoo config.params || die - - echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die - echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die - echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die -} - -src_compile() { - tc-export CC CXX - - emake -} - -src_test() { - addwrite /dev/full - emake -j1 check -} - -src_install() { - # TODO: ${PN} or no? - dodir /var/games /usr/share/man/man{1,6} - emake -j1 DESTDIR="${D}" install - - dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \ - README PACKAGING SECURITY THANKS TODO YEAR2000 - - _build_game() { - has ${1} ${GAMES_TO_BUILD} - } - - _do_statefile() { - touch "${ED}"/var/games/${1} || die - chmod ug+rw "${ED}"/var/games/${1} || die - } - - # set some binaries to run as games group (+S) - _build_game atc && fperms g+s /usr/bin/atc - _build_game battlestar && fperms g+s /usr/bin/battlestar - _build_game canfield && fperms g+s /usr/bin/canfield - _build_game cribbage && fperms g+s /usr/bin/cribbage - _build_game phantasia && fperms g+s /usr/bin/phantasia - _build_game robots && fperms g+s /usr/bin/robots - _build_game sail && fperms g+s /usr/bin/sail - _build_game snake && fperms g+s /usr/bin/snake - _build_game tetris && fperms g+s /usr/bin/tetris-bsd - - elog "Renaming monop to monop-bsd to avoid collision with dev-lang/mono" - mv "${ED}"/usr/bin/monop "${ED}"/usr/bin/monop-bsd || die - - # state files - _build_game atc && _do_statefile atc_score - _build_game battlestar && _do_statefile battlestar.log - _build_game canfield && _do_statefile cfscores - _build_game cribbage && _do_statefile criblog - _build_game hack && keepdir /var/games/hack - _build_game robots && _do_statefile robots_roll - _build_game sail && _do_statefile sail/saillog - _build_game snake && _do_statefile snake.log && _do_statefile snakerawscores - _build_game tetris && _do_statefile tetris-bsd.scores - - # extra docs - _build_game atc && { docinto atc ; dodoc atc/BUGS; } - _build_game boggle && { docinto boggle ; dodoc boggle/README; } - _build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; } - _build_game hunt && { docinto hunt ; dodoc hunt/README; } - _build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; } - - # All of this needs to be owned by the gamestat group - fowners -R :gamestat /var/games/ - # ... and so do the binaries - fowners -R :gamestat /usr/bin/ - - # State dirs - chmod -R ug+rw "${ED}"/var/games/ || die -} diff --git a/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild new file mode 100644 index 000000000000..585d54cb4beb --- /dev/null +++ b/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DEB_PATCH_VER=28 +DESCRIPTION="Collection of games from NetBSD" +HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/" +#SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${PN}-$(ver_cut 1-2).tar.gz" +SRC_URI="http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz" +SRC_URI+=" mirror://debian/pool/main/b/bsdgames/bsdgames_$(ver_cut 1-2)-${DEB_PATCH_VER}.debian.tar.xz" +S="${WORKDIR}/${PN}-$(ver_cut 1-2)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~x86" + +DEPEND=" + sys-apps/miscfiles + sys-libs/ncurses:0= + !app-misc/banner + !games-misc/wtf + !games-puzzle/hangman +" +RDEPEND=" + ${DEPEND} + acct-group/gamestat +" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" + +# Set GAMES_TO_BUILD variable to whatever you want +GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc +backgammon banner battlestar bcd boggle caesar canfield countmail cribbage +dab dm fish gomoku hack hangman hunt mille monop morse +number phantasia pig pom primes ppt quiz rain random robots sail snake +tetris trek wargames worm worms wtf} + +src_prepare() { + local debian_patch_dir="${WORKDIR}"/debian/patches + for patch in $(<"${debian_patch_dir}"/series) ; do + eapply "${debian_patch_dir}"/${patch} + done + + # Additional patches on top of Debian patchset + eapply "${FILESDIR}"/${PN}-2.17-64bitutmp.patch + eapply "${FILESDIR}"/${PN}-2.17-bg.patch + eapply "${FILESDIR}"/${PN}-2.17-gcc4.patch + eapply "${FILESDIR}"/${PN}-2.17-rename-getdate-clash.patch + + default + + # Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652 + sed -i \ + -e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \ + configure || die + + sed -i \ + -e "s:/usr/games:/usr/bin:" \ + wargames/wargames || die + + sed -i \ + -e '/^CC :=/d' \ + -e '/^CXX :=/d' \ + -e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \ + -e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \ + -e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \ + Makeconfig.in || die + + # Used by config.params + export GAMES_BINDIR=/usr/bin + export GAMES_DATADIR=/usr/share + export GAMES_STATEDIR=/var/games + cp "${FILESDIR}"/config.params-gentoo config.params || die + + echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die + echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die + echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die +} + +src_compile() { + tc-export CC CXX + + emake +} + +src_test() { + addwrite /dev/full + emake -j1 check +} + +src_install() { + # TODO: ${PN} or no? + dodir /var/games /usr/share/man/man{1,6} + emake -j1 DESTDIR="${D}" install + + dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \ + README PACKAGING SECURITY THANKS TODO YEAR2000 + + _build_game() { + has ${1} ${GAMES_TO_BUILD} + } + + _do_statefile() { + touch "${ED}"/var/games/${1} || die + chmod ug+rw "${ED}"/var/games/${1} || die + } + + # set some binaries to run as games group (+S) + _build_game atc && fperms g+s /usr/bin/atc + _build_game battlestar && fperms g+s /usr/bin/battlestar + _build_game canfield && fperms g+s /usr/bin/canfield + _build_game cribbage && fperms g+s /usr/bin/cribbage + _build_game phantasia && fperms g+s /usr/bin/phantasia + _build_game robots && fperms g+s /usr/bin/robots + _build_game sail && fperms g+s /usr/bin/sail + _build_game snake && fperms g+s /usr/bin/snake + _build_game tetris && fperms g+s /usr/bin/tetris-bsd + + elog "Renaming monop to monop-bsd to avoid collision with dev-lang/mono" + mv "${ED}"/usr/bin/monop "${ED}"/usr/bin/monop-bsd || die + + # state files + _build_game atc && _do_statefile atc_score + _build_game battlestar && _do_statefile battlestar.log + _build_game canfield && _do_statefile cfscores + _build_game cribbage && _do_statefile criblog + _build_game hack && keepdir /var/games/hack + _build_game robots && _do_statefile robots_roll + _build_game sail && _do_statefile sail/saillog + _build_game snake && _do_statefile snake.log && _do_statefile snakerawscores + _build_game tetris && _do_statefile tetris-bsd.scores + + # extra docs + _build_game atc && { docinto atc ; dodoc atc/BUGS; } + _build_game boggle && { docinto boggle ; dodoc boggle/README; } + _build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; } + _build_game hunt && { docinto hunt ; dodoc hunt/README; } + _build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; } + + # All of this needs to be owned by the gamestat group + fowners -R :gamestat /var/games/ + # ... and so do the binaries + fowners -R :gamestat /usr/bin/ + + # State dirs + chmod -R ug+rw "${ED}"/var/games/ || die +} diff --git a/games-misc/sdljoytest/Manifest b/games-misc/sdljoytest/Manifest index 47adb8b1eee3..1792cdfc7827 100644 --- a/games-misc/sdljoytest/Manifest +++ b/games-misc/sdljoytest/Manifest @@ -1,4 +1,4 @@ AUX sdljoytest-11102003-no-common.patch 238 BLAKE2B fecf305d2bc4534c515c5bc8e81d45489c1e14efc0afe34d5f20b06f40050efa0347b710c4c5e0d5b3e6606c95b5a093e9ecff7d193d3453eee067c1c0961ad7 SHA512 752feddb09c42775df2b5c8810d6d2b95dedb97d2e5c7812e044394bf05b2370f7e47c90eb36e62b7aed7c4d138f04ebf7e238d5ae2b9aafa546fbc522176d3a DIST SDLJoytest-GL-11102003.tar.bz2 85997 BLAKE2B 23ae410c462d9501306d6e225d2523ef940dd3f3e6ab7c898313a25253f86c42d3c0c7d64385a0c6de06331ca68ddc49296cea572f0a1f42161a912e8ff3274d SHA512 4994e878eaacacb156d4d9988d1e7864ed4e5e3d4db6bc0be8a883d7edde87d56698eb22de5d39e2110be7f960e5bf080283a7563bb2bc3f17c390181e097c6a -EBUILD sdljoytest-11102003.ebuild 924 BLAKE2B 76486a2d99dbeb4ff0e592080e2405f1de12a0c9d44310f029d3f11ce7132194bf739b829ca74f7683fbdc30e7d2c3b67d35ecfd3c3fd5051be2b1df7256d289 SHA512 b22c2f6c4d433a685f0a23551e1f751704c7a98f7a2fdcf20571b9c827210c752f0078393a7df37b713d6af745dd2d40b599088fe1219dd33b4fcb061605cef5 +EBUILD sdljoytest-11102003.ebuild 926 BLAKE2B a352e1ebc4c8eb7caf90122616609fc1189478929190c8373c5dc80c1d710a2dfc6e76b4a81138a01f4718ab2d4f53b20b6f1688326f39085747335219d2c01f SHA512 7962b1a3e1d8850628182b487f9ee07fd38bba1101b5068d9785ef8f83cd8a5b0c0288567182d42e2519c6ed02ac66fdc847337232e1b4a4bdd4cf04ddd952b3 MISC metadata.xml 333 BLAKE2B 5eadf19507a2a63c03c3457ae2efec7cbc5a2b6abc8d323c7f38510f639b795e56d1e83e7ead78c1d3930317e712d6536cdc5453c84bc66573ea7c5963f63f58 SHA512 f3c36c935fc927fa6ccf4402f67ec8d213fd94c2bf5855b4f1e6852c3c2c32fa051998cda971050c7f2f3257dc4102369c0af8d5d386ecb2a1e4d2ab177217d9 diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild index 335b1b27c354..8519be5e1834 100644 --- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild +++ b/games-misc/sdljoytest/sdljoytest-11102003.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ IUSE="" DEPEND="media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-image" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" S=${WORKDIR}/SDLJoytest-GL -- cgit v1.2.3