commit: 3b31f231bc73691c868586474451e167d25d072c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 18:20:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 18:35:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b31f231
games-arcade/performous: EAPI-6 bump, QA: don't compress man
Sort dependencies, drop superfluous overrides.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/performous-1.1-nomancompress.patch | 59 ++++++++++++++++++++++
games-arcade/performous/performous-1.1-r1.ebuild | 58 +++++++++------------
2 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/games-arcade/performous/files/performous-1.1-nomancompress.patch
b/games-arcade/performous/files/performous-1.1-nomancompress.patch
new file mode 100644
index 00000000000..fd21f9b7034
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.1-nomancompress.patch
@@ -0,0 +1,59 @@
+--- a/docs/man/CMakeLists.txt 2018-10-14 19:57:14.924572577 +0200
++++ b/docs/man/CMakeLists.txt 2018-10-14 20:11:13.250717230 +0200
+@@ -1,14 +1,12 @@
+ find_program(HELP2MAN help2man DOC "Location of the help2man program")
+-find_program(GZIP gzip DOC "Location of the gzip program")
+ mark_as_advanced(HELP2MAN)
+-mark_as_advanced(GZIP)
+-if(HELP2MAN AND GZIP)
+- set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6.gz)
++if(HELP2MAN)
++ set(MANFILE ${CMAKE_CURRENT_BINARY_DIR}/performous.6)
+ set(H2MFILE ${CMAKE_CURRENT_SOURCE_DIR}/performous.h2m)
+ set(PERFORMOUS_EXEC ${CMAKE_BINARY_DIR}/performous)
+ add_custom_command(
+ OUTPUT ${MANFILE}
+- COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N |
${GZIP} > ${MANFILE}
++ COMMAND ${HELP2MAN} ${PERFORMOUS_EXEC} -s 6 -i ${H2MFILE} -N >
${MANFILE}
+ MAIN_DEPENDENCY ${H2MFILE}
+ DEPENDS ${PERFORMOUS_EXEC}
+ COMMENT "Building Performous man page"
+@@ -17,13 +15,13 @@
+ add_custom_target(manpage ALL DEPENDS ${MANFILE})
+ iF (APPLE)
+ install(FILES ${MANFILE} DESTINATION Resources/man/man6)
+- else(APPLE)
++ else()
+ install(FILES ${MANFILE} DESTINATION share/man/man6)
+ endif()
+-else(HELP2MAN AND GZIP)
+- message("WARNING: One of the following is missing: help2man, gzip;
performous man page will not be generated")
+-endif(HELP2MAN AND GZIP)
+-if(ENABLE_TOOLS AND GZIP)
++else()
++ message("WARNING: help2man is missing; performous man page will not be
generated")
++endif()
++if(ENABLE_TOOLS)
+ set(TOOLS
+ "ss_pak_extract" "ss_extract" "ss_cover_conv"
+ "ss_adpcm_decode" "ss_ipu_conv" "ss_chc_decode"
+@@ -31,15 +29,7 @@
+ set(MAN_SECTION "1")
+ foreach(TOOL ${TOOLS})
+ set(TOOL_MANFILE
${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.${MAN_SECTION})
+- set(TOOL_MANFILE_GZ
${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.${MAN_SECTION}.gz)
+- add_custom_command(
+- OUTPUT ${TOOL_MANFILE_GZ}
+- COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
+- MAIN_DEPENDENCY ${TOOL_MANFILE}
+- COMMENT "Building ${TOOL} man page"
+- VERBATIM
+- )
+- add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS
${TOOL_MANFILE_GZ})
+- install(FILES ${TOOL_MANFILE_GZ} DESTINATION
share/man/man${MAN_SECTION})
+- endforeach(TOOL)
+-endif(ENABLE_TOOLS AND GZIP)
++ add_custom_target(${TOOL}.${MAN_SECTION} ALL DEPENDS
${TOOL_MANFILE})
++ install(FILES ${TOOL_MANFILE} DESTINATION
share/man/man${MAN_SECTION})
++ endforeach()
++endif()
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild
b/games-arcade/performous/performous-1.1-r1.ebuild
index 6b8850506d5..774e839768c 100644
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
+
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext
FindJpeg FindPng FindTiff FindZ"
-
-inherit desktop cmake-utils epatch gnome2-utils
+inherit cmake-utils desktop gnome2-utils
MY_PN="Performous"
MY_P="${MY_PN}-${PV}"
@@ -13,8 +13,7 @@ SONGS_PN="ultrastar-songs"
DESCRIPTION="SingStar GPL clone"
HOMEPAGE="https://performous.org/";
-SRC_URI="
- https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
+SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz ->
${P}.tar.gz
songs? (
mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
@@ -23,12 +22,7 @@ SRC_URI="
)
"
-LICENSE="
- GPL-2
- songs? (
- CC-BY-NC-SA-2.5
- CC-BY-NC-ND-2.5
- )
+LICENSE="GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -37,24 +31,24 @@ IUSE="midi songs tools webcam"
RDEPEND="
dev-cpp/glibmm:2
dev-cpp/libxmlpp:2.6
- media-libs/portaudio
dev-libs/boost[threads(+)]
dev-libs/glib:2
dev-libs/libxml2:2
gnome-base/librsvg:2
media-gfx/imagemagick:0=
- virtual/jpeg:0
+ media-libs/libepoxy
media-libs/libpng:0=
media-libs/libsdl2[joystick,video]
+ media-libs/portaudio
+ sys-libs/zlib
virtual/ffmpeg
- virtual/opengl
virtual/glu
- sys-libs/zlib
+ virtual/jpeg:0
virtual/libintl
+ virtual/opengl
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/pango
- media-libs/libepoxy
midi? ( media-libs/portmidi )
webcam? ( media-libs/opencv )
"
@@ -63,11 +57,17 @@ DEPEND="${RDEPEND}
sys-devel/gettext
"
+DOCS=( docs/{Authors,instruments}.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-linguas.patch
+ "${FILESDIR}"/${P}-nomancompress.patch
+)
+
src_prepare() {
cmake-utils_src_prepare
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-linguas.patch
+
sed -i \
-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-e '/ Z /s/ Z/ ZLIB/g' \
@@ -76,37 +76,27 @@ src_prepare() {
-e 's/Jpeg/JPEG/' \
-e 's/Png/PNG/' \
{game,tools}/CMakeLists.txt || die
-
- strip-linguas -u lang
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_enable tools TOOLS)
- $(cmake-utils_use_enable webcam WEBCAM)
- $(cmake-utils_use_enable midi MIDI)
+ -DENABLE_TOOLS=$(usex tools)
+ -DENABLE_WEBCAM=$(usex webcam)
+ -DENABLE_MIDI=$(usex midi)
-DCMAKE_VERBOSE_MAKEFILE=TRUE
-DSHARE_INSTALL="/usr/share/${PN}"
)
cmake-utils_src_configure
}
-src_compile() {
- cmake-utils_src_compile
-}
-
src_install() {
cmake-utils_src_install
if use songs ; then
insinto "/usr/share/${PN}"
doins -r "${WORKDIR}/songs"
fi
- dodoc docs/{Authors,instruments}.txt
- newicon -s scalable data/themes/default/icon.svg ${PN}.svg
-}
-pkg_preinst() {
- gnome2_icon_savelist
+ newicon -s scalable data/themes/default/icon.svg ${PN}.svg
}
pkg_postinst() {
