From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B678139694 for ; Mon, 1 May 2017 16:17:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E82E21C07C; Mon, 1 May 2017 16:17:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A05E21C07C for ; Mon, 1 May 2017 16:17:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B45CF3416C7 for ; Mon, 1 May 2017 16:17:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F031743E for ; Mon, 1 May 2017 16:17:32 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1493655422.6855ac7b26fa7352ab7329954cabcb091d36ed56.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/gemrb/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/gemrb/gemrb-0.8.3-r1.ebuild games-engines/gemrb/gemrb-0.8.3.ebuild X-VCS-Directories: games-engines/gemrb/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 6855ac7b26fa7352ab7329954cabcb091d36ed56 X-VCS-Branch: master Date: Mon, 1 May 2017 16:17:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e57ffa97-8ae7-4685-9ce9-04fa2f081924 X-Archives-Hash: 7950e232bdfc3d161552aa6c18f1c1a0 commit: 6855ac7b26fa7352ab7329954cabcb091d36ed56 Author: David Seifert gentoo org> AuthorDate: Mon May 1 15:39:32 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Mon May 1 16:17:02 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6855ac7b games-engines/gemrb: [QA] Remove WANT_CMAKE * Other misc python fixes Bug: https://bugs.gentoo.org/show_bug.cgi?id=616064 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4528 games-engines/gemrb/gemrb-0.8.3-r1.ebuild | 52 ++++++++++++++----------------- games-engines/gemrb/gemrb-0.8.3.ebuild | 7 +++-- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild index ef446bfd850..6ec09ffb527 100644 --- a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild +++ b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) -WANT_CMAKE=always -inherit eutils python-any-r1 cmake-utils gnome2-utils + +inherit eutils gnome2-utils python-single-r1 cmake-utils DESCRIPTION="Reimplementation of the Infinity engine" HOMEPAGE="http://gemrb.sourceforge.net/" @@ -14,9 +15,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="media-libs/freetype - media-libs/libpng:0 +RDEPEND=" + media-libs/freetype + media-libs/libpng:0= >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal @@ -26,12 +29,8 @@ RDEPEND="media-libs/freetype DEPEND="${RDEPEND} virtual/pkgconfig" -pkg_setup() { - python-any-r1_pkg_setup -} - src_prepare() { - default + cmake-utils_src_prepare sed -i \ -e '/COPYING/d' \ @@ -39,28 +38,25 @@ src_prepare() { } src_configure() { - mycmakeargs=( - -DBIN_DIR="/usr/bin" - -DCMAKE_INSTALL_PREFIX="/usr" - -DDATA_DIR="/usr/share/gemrb" - -DDOC_DIR="/usr/share/doc/${PF}" - -DICON_DIR=/usr/share/pixmaps - -DLIB_DIR="/usr/$(get_libdir)" - -DMAN_DIR=/usr/share/man/man6 - -DMENU_DIR=/usr/share/applications - -DSVG_DIR=/usr/share/icons/hicolor/scalable/apps - -DSYSCONF_DIR="/etc/${PN}" - ) + local mycmakeargs=( + -DBIN_DIR=bin + -DDATA_DIR=share/gemrb + -DDOC_DIR=share/doc/${PF} + -DICON_DIR=share/pixmaps + -DLIB_DIR=$(get_libdir) + -DMAN_DIR=share/man/man6 + -DMENU_DIR=share/applications + -DSVG_DIR=share/icons/hicolor/scalable/apps + -DSYSCONF_DIR=/etc/${PN} + # needed, causes massive QA warnings otherwise + -DCMAKE_SKIP_RPATH=ON + ) cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { - DOCS="README NEWS AUTHORS" \ - cmake-utils_src_install + cmake-utils_src_install + python_fix_shebang "${ED%/}"/usr/bin/extend2da.py } pkg_preinst() { diff --git a/games-engines/gemrb/gemrb-0.8.3.ebuild b/games-engines/gemrb/gemrb-0.8.3.ebuild index 6fbd80936e1..b7ba53323a6 100644 --- a/games-engines/gemrb/gemrb-0.8.3.ebuild +++ b/games-engines/gemrb/gemrb-0.8.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 + PYTHON_COMPAT=( python2_7 ) -WANT_CMAKE=always + inherit eutils python-any-r1 cmake-utils gnome2-utils games DESCRIPTION="Reimplementation of the Infinity engine" @@ -38,7 +39,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" -DBIN_DIR="${GAMES_BINDIR}" -DDATA_DIR="${GAMES_DATADIR}/gemrb"