* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/pathological/, games-puzzle/pathological/files/
@ 2019-12-25 19:59 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2019-12-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: e9b10eae57d8f855750fc68eb864576814483945
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 19:58:53 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 19:59:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b10eae
games-puzzle/pathological: Fixes from Debian, python3 support
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
games-puzzle/pathological/Manifest | 1 +
.../files/pathological-1.1.3-build-r1.patch | 12 +++
.../pathological/pathological-1.1.3_p16.ebuild | 105 +++++++++++++++++++++
3 files changed, 118 insertions(+)
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 3158e4415ea..4370a404bec 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1 +1,2 @@
DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
+DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
new file mode 100644
index 00000000000..48038df0003
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.old 2019-12-25 20:55:37.932303932 +0100
++++ b/Makefile 2019-12-25 20:55:58.584530808 +0100
+@@ -4,9 +4,6 @@
+
+ all: write-highscores docs
+
+-write-highscores: write-highscores.c
+- gcc -s -o write-highscores write-highscores.c
+-
+ docs: html/wheel.png
+ html/wheel.png:
+ ./makehtml
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
new file mode 100644
index 00000000000..f7d5b90b628
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P/_p*}.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ doc? ( media-libs/netpbm )
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}" || die
+ unpack ./${PN}.6.gz
+}
+
+src_prepare() {
+ default
+
+ # Debian fixes
+ # We don't face this bug, this way we skip needing to convert the
+ # files at build time
+ sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
+
+ for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+ eapply -p1 "${WORKDIR}/debian/patches/${p}"
+ done
+
+ # Fix prestripped files
+ eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
+
+ if use doc ; then
+ sed -i -e '5,$ s/=/ /g' makehtml || die
+ else
+ echo "#!/bin/sh" > makehtml
+ fi
+
+ sed -i \
+ -e "s:/usr/share/games:/usr/share:" \
+ -e "s:exec:exec ${EPYTHON}:" \
+ ${PN} || die
+
+ sed -i \
+ -e 's:\xa9:(C):' \
+ -e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
+ ${PN}.py || die
+
+ python_fix_shebang ${PN}.py
+}
+
+src_install() {
+ dobin ${PN}
+
+ exeinto /usr/"$(get_libdir)"/${PN}
+ doexe write-highscores
+
+ insinto /usr/share/${PN}
+ doins -r circuits graphics music sounds ${PN}.py
+
+ insinto /var/games/
+ doins ${PN}_scores
+ fperms 660 /var/games/${PN}_scores
+
+ dodoc changelog README TODO
+ doman ${PN}.6
+ use doc && dohtml -r html/*
+
+ doicon ${PN}.xpm
+ make_desktop_entry ${PN} Pathological ${PN}
+
+ # remove some unneeded resource files
+ rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
+}
+
+pkg_postinst() {
+ if ! has_version "media-libs/sdl-mixer[mod]" ; then
+ echo
+ elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
+ elog "no background music will be played."
+ echo
+ fi
+
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/pathological/, games-puzzle/pathological/files/
@ 2019-12-25 19:59 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2019-12-25 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 13374ab0e4ac61e8935e1effc9bbc02777324f99
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 19:59:15 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 19:59:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13374ab0
games-puzzle/pathological: Drop old
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../files/pathological-1.1.3-build.patch | 27 ------
.../files/pathological-1.1.3-music-py.patch | 23 ------
.../pathological/pathological-1.1.3-r3.ebuild | 95 ----------------------
3 files changed, 145 deletions(-)
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build.patch b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
deleted file mode 100644
index d8793a6aef6..00000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use implicit rules to build write-highscores so we dont have to worry
-about CC/CFLAGS/LDFLAGS/etc...
-
-Include stdlib.h to get exit() prototype
-
---- write-highscores.c
-+++ write-highscores.c
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdlib.h>
-
- #define BUFFER_SIZE 1024
-
---- Makefile
-+++ Makefile
-@@ -4,9 +4,6 @@
-
- all: write-highscores html/wheel.png
-
--write-highscores: write-highscores.c
-- gcc -s -o write-highscores write-highscores.c
--
- html/wheel.png:
- ./makehtml
-
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
deleted file mode 100644
index 9d67085dd13..00000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make sure music_pending_song is defined before we try using it
-
-http://bugs.gentoo.org/109272
-
---- pathological.py
-+++ pathological.py
-@@ -28,6 +28,7 @@
- colorblind = 0
- sound_on = 1
- music_on = 1
-+music_pending_song = 0
- for arg in sys.argv[1:]:
- if arg == '-s':
- screenshot = 1
-@@ -194,7 +195,7 @@
- sound_on = sound_on ^ 1
-
- def toggle_music():
-- global music_on
-+ global music_pending_song, music_on
- music_on = music_on ^ 1
- if music_on:
- if music_pending_song:
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
deleted file mode 100644
index 88e3d609d04..00000000000
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,95 +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="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- app-shells/bash
- >=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
- doc? ( media-libs/netpbm )"
-
-pkg_setup() {
- games_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- unpack ./${PN}.6.gz
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-music-py.patch
-
- if use doc ; then
- sed -i -e '5,$ s/=/ /g' makehtml || die
- else
- echo "#!/bin/sh" > makehtml
- fi
-
- sed -i \
- -e "s:/usr/share/games:${GAMES_DATADIR}:" \
- -e "s:/var/games:${GAMES_STATEDIR}:" \
- -e "s:exec:exec ${EPYTHON}:" \
- ${PN} || die
-
- sed -i \
- -e 's:\xa9:(C):' \
- -e "s:/usr/lib/${PN}/bin:$(games_get_libdir)/${PN}:" \
- ${PN}.py || die
-
- python_fix_shebang ${PN}.py
-}
-
-src_install() {
- dogamesbin ${PN}
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe write-highscores
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r circuits graphics music sounds ${PN}.py
-
- insinto "${GAMES_STATEDIR}"
- doins ${PN}_scores
- fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
-
- dodoc changelog README TODO
- doman ${PN}.6
- use doc && dohtml -r html/*
-
- doicon ${PN}.xpm
- make_desktop_entry ${PN} Pathological ${PN}
-
- # remove some unneeded resource files
- rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- if ! has_version "media-libs/sdl-mixer[mod]" ; then
- echo
- elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
- elog "no background music will be played."
- echo
- fi
-
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-puzzle/pathological/, games-puzzle/pathological/files/
@ 2021-06-05 5:07 Ionen Wolkens
0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2021-06-05 5:07 UTC (permalink / raw
To: gentoo-commits
commit: fd68055c9bf71741752cd766b10b5d2c67479091
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 5 04:59:57 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 5 05:04:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd68055c
games-puzzle/pathological: drop 1.1.3_p16-r2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/pathological-1.1.3-build-r1.patch | 12 ---
.../pathological/pathological-1.1.3_p16-r2.ebuild | 112 ---------------------
2 files changed, 124 deletions(-)
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
deleted file mode 100644
index 48038df0003..00000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.old 2019-12-25 20:55:37.932303932 +0100
-+++ b/Makefile 2019-12-25 20:55:58.584530808 +0100
-@@ -4,9 +4,6 @@
-
- all: write-highscores docs
-
--write-highscores: write-highscores.c
-- gcc -s -o write-highscores write-highscores.c
--
- docs: html/wheel.png
- html/wheel.png:
- ./makehtml
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild
deleted file mode 100644
index 9a41e9a28b0..00000000000
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit desktop python-single-r1 toolchain-funcs
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="
- mirror://sourceforge/${PN}/${P/_p*}.tar.gz
- mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: locks up at start with >=pygame-2 (debian uses pygame-1, fix needed)
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
- <dev-python/pygame-2[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- doc? ( media-libs/netpbm )
-"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
- unpack ./${PN}.6.gz
-}
-
-src_prepare() {
- default
-
- # Debian fixes
- # We don't face this bug, this way we skip needing to convert the
- # files at build time
- sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
-
- for p in $(<"${WORKDIR}"/debian/patches/series) ; do
- eapply -p1 "${WORKDIR}/debian/patches/${p}"
- done
-
- # Fix prestripped files
- eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
-
- if use doc ; then
- sed -i -e '5,$ s/=/ /g' makehtml || die
- else
- echo "#!/bin/sh" > makehtml
- fi
-
- sed -i \
- -e "s:/usr/share/games:/usr/share:" \
- -e "s:exec:exec ${EPYTHON}:" \
- ${PN} || die
-
- sed -i \
- -e 's:\xa9:(C):' \
- -e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
- ${PN}.py || die
-
- python_fix_shebang ${PN}.py
-
- tc-export CC
-}
-
-src_install() {
- dobin ${PN}
-
- exeinto /usr/"$(get_libdir)"/${PN}
- doexe write-highscores
-
- insinto /usr/share/${PN}
- doins -r circuits graphics music sounds ${PN}.py
-
- insinto /var/games/
- doins ${PN}_scores
- fperms 660 /var/games/${PN}_scores
-
- doman ${PN}.6
- use doc && local HTML_DOCS=( html/. )
- einstalldocs
- dodoc changelog
-
- doicon ${PN}.xpm
- make_desktop_entry ${PN} Pathological ${PN}
-
- # remove some unneeded resource files
- rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
-}
-
-pkg_postinst() {
- if ! has_version "media-libs/sdl-mixer[mod]" ; then
- echo
- elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
- elog "no background music will be played."
- echo
- fi
-
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-05 5:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-25 19:59 [gentoo-commits] repo/gentoo:master commit in: games-puzzle/pathological/, games-puzzle/pathological/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2019-12-25 19:59 Pacho Ramos
2021-06-05 5:07 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox