commit: d36ae2a4b127f5510f6786642229e514e52028c8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 05:56:09 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 05:56:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d36ae2a4
games-action/openclonk: Remove last-rited pkg Closes: https://bugs.gentoo.org/646748 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> games-action/openclonk/Manifest | 1 - .../openclonk/files/openclonk-7.0-paths.patch | 68 ------------ .../openclonk/files/openclonk-7.0-postinst.patch | 14 --- .../openclonk/files/openclonk-wrapper-script.sh | 9 -- games-action/openclonk/metadata.xml | 23 ----- games-action/openclonk/openclonk-7.0.ebuild | 114 --------------------- profiles/package.mask | 6 -- 7 files changed, 235 deletions(-) diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest deleted file mode 100644 index 1e5529962b5..00000000000 --- a/games-action/openclonk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openclonk-7.0-src.tar.bz2 102143348 BLAKE2B 2ea6aa1aaca21795c80ee668b17fbfbfe0d5bc4fb4607066eb75e3d25ba0e81de06959e335ab8076cda04b05c4569ea1fcc02d9856e010f12e7ad678ead8519b SHA512 b7ea557b5441986c0527abcb9c074c462f73bf45dd7ac4835329169d63ace5cc02e122d0dee7241da8621a7727ce9b09a2ad17e06dfc5610fcb529d350a51577 diff --git a/games-action/openclonk/files/openclonk-7.0-paths.patch b/games-action/openclonk/files/openclonk-7.0-paths.patch deleted file mode 100644 index 4ebd6034a59..00000000000 --- a/games-action/openclonk/files/openclonk-7.0-paths.patch +++ /dev/null @@ -1,68 +0,0 @@ -Updated for openclonk-6.0, based on this patch: - From: Julian Ospald <hasuf...@gentoo.org> - Date: Thu Feb 6 19:58:45 UTC 2014 - Subject: make paths modifiable - ---- openclonk-release-6.0-src.orig/CMakeLists.txt -+++ openclonk-release-6.0-src/CMakeLists.txt -@@ -42,6 +42,16 @@ - set(${_var} "${_string}" PARENT_SCOPE) - endfunction() - -+ -+############################################################################ -+# User selectable paths -+############################################################################ -+set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination") -+set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination") -+set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination") -+set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination") -+ -+ - ############################################################################ - # User selectable options - ############################################################################ -@@ -1212,10 +1222,16 @@ - # Assemble compiler flags - ############################################################################ - if(UNIX) -+ if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}") -+ set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}") -+ else() -+ set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}") -+ endif() -+ - # Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached, - # and when the path is changed both the old and new definition appears - # in the list of flags. -- add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"") -+ add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"") - endif() - if(OC_CXX_FLAGS) - list(REMOVE_DUPLICATES OC_CXX_FLAGS) -@@ -1537,7 +1553,7 @@ - DEPENDS "${native_c4group}" - VERBATIM - ) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk") - endif() - endforeach() - -@@ -1546,13 +1562,13 @@ - add_dependencies(data groups) - - # Install new files -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications") - # Update the MIME cache -- this makes the clonk:// protocol handler actually work - install(CODE "execute_process(COMMAND update-desktop-database)") - - # Install binaries -- install(TARGETS openclonk DESTINATION games) -- install(TARGETS c4group DESTINATION bin) -+ install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}") -+ install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}") - else() - install(TARGETS openclonk - BUNDLE DESTINATION . diff --git a/games-action/openclonk/files/openclonk-7.0-postinst.patch b/games-action/openclonk/files/openclonk-7.0-postinst.patch deleted file mode 100644 index 26ad61ec678..00000000000 --- a/games-action/openclonk/files/openclonk-7.0-postinst.patch +++ /dev/null @@ -1,14 +0,0 @@ -update-desktop-database is called from the pkg_postinst stage instead. - ---- openclonk-release-6.0-src.orig/CMakeLists.txt -+++ openclonk-release-6.0-src/CMakeLists.txt -@@ -1564,7 +1564,8 @@ - # Install new files - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications") - # Update the MIME cache -- this makes the clonk:// protocol handler actually work -- install(CODE "execute_process(COMMAND update-desktop-database)") -+ # --> ebuild, pkg_postinst stage -+ #install(CODE "execute_process(COMMAND update-desktop-database)") - - # Install binaries - install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}") diff --git a/games-action/openclonk/files/openclonk-wrapper-script.sh b/games-action/openclonk/files/openclonk-wrapper-script.sh deleted file mode 100644 index 9f7e6444288..00000000000 --- a/games-action/openclonk/files/openclonk-wrapper-script.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# wrapper prevents the game to look for .ocp files in the current dir -# which can lead to weird behavior and game freeze - -[ -d ~/.clonk/openclonk ] || mkdir -p ~/.clonk/openclonk - -cd ~/.clonk/openclonk - -exec clonk "$@" diff --git a/games-action/openclonk/metadata.xml b/games-action/openclonk/metadata.xml deleted file mode 100644 index 8d041fd7d41..00000000000 --- a/games-action/openclonk/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>ga...@gentoo.org</email> - <name>Gentoo Games Project</name> - </maintainer> - <upstream> - <changelog>http://hg.openclonk.org/openclonk/</changelog> - <doc lang="en">http://wiki.openclonk.org/w/C4Script_Documentation</doc> - <bugs-to>http://bugs.openclonk.org/</bugs-to> - </upstream> - <longdescription lang="en"> - OpenClonk is the Open source successor of the Clonk gaming series. - OpenClonk is a project dedicated to the further development of the - Clonk game series. Our goal is to improve and make the real strengths - of Clonk more fun to play: Bustling mining, production lines and - economy, fast and fiddly melees. Another focus lies on the further - enchancement of the game engine and the extensibility/modability of - the game content with C4Script which has always been one of the most - important features of Clonk. - </longdescription> -</pkgmetadata> diff --git a/games-action/openclonk/openclonk-7.0.ebuild b/games-action/openclonk/openclonk-7.0.ebuild deleted file mode 100644 index 5543cc1292e..00000000000 --- a/games-action/openclonk/openclonk-7.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime toolchain-funcs games - -MY_P=${PN}-release-${PV}-src - -DESCRIPTION="A free multiplayer action game where you control clonks" -HOMEPAGE="https://openclonk.org/"; -SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2"; - -LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="dedicated doc" - -RDEPEND=" - >=dev-libs/boost-1.40:= - dev-libs/tinyxml - net-libs/libupnp - media-libs/libpng:0= - sys-libs/zlib - !dedicated? ( - dev-libs/glib:2 - media-libs/freealut - media-libs/freetype:2 - media-libs/glew - media-libs/libsdl[X,opengl,sound,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl-mixer[mp3,vorbis,wav] - virtual/jpeg:0= - virtual/opengl - virtual/glu - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libXrandr - x11-libs/libX11 - ) - dedicated? ( sys-libs/readline:0= )" -DEPEND="${RDEPEND} - || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) - virtual/pkgconfig - doc? ( - ${PYTHON_DEPS} - dev-libs/libxml2[python] - sys-devel/gettext - )" - -PATCHES=( - "${FILESDIR}"/${P}-paths.patch - "${FILESDIR}"/${P}-postinst.patch -) -S=${WORKDIR}/${P}-src - -pkg_setup() { - games_pkg_setup - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(usex dedicated \ - "-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \ - "-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON") - -DWITH_AUTOMATIC_UPDATE=OFF - -DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}" - -DINSTALL_DATADIR="${GAMES_DATADIR}" - -DUSE_STATIC_BOOST=OFF - -DUSE_SYSTEM_TINYXML=ON - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use doc && emake -C docs -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated; then - mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die - newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN} - fi - use doc && dohtml -r docs/online/* - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/profiles/package.mask b/profiles/package.mask index b23208e1920..13e0950daf1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -680,12 +680,6 @@ sci-geosciences/gdal-grass sci-geosciences/grass www-apps/trac -# Michał Górny <mgo...@gentoo.org> (2020-08-22) -# Effectively unmaintained. Optionally uses Python 2. I could remove -# that but it fails to build anyway. -# Removal in 30 days. Bug #646748. -games-action/openclonk - # Alfredo Tupone <tup...@gentoo.org> (2020-08-16) # Ported to py3.8 but not yet released # Masked to allow py2.7 removal
