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 64B99139694 for ; Wed, 26 Apr 2017 18:44:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFA20E07D0; Wed, 26 Apr 2017 18:44:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7EBFEE07D0 for ; Wed, 26 Apr 2017 18:44:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 2E32D341659 for ; Wed, 26 Apr 2017 18:44:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9F257441 for ; Wed, 26 Apr 2017 18:43:59 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1493232235.438e3912063d437bf8aa036f8812fdf4dd3cccde.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/freeorion/Manifest games-strategy/freeorion/freeorion-0.4.6.ebuild games-strategy/freeorion/freeorion-9999.ebuild X-VCS-Directories: games-strategy/freeorion/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 438e3912063d437bf8aa036f8812fdf4dd3cccde X-VCS-Branch: master Date: Wed, 26 Apr 2017 18:43:59 +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: 18f20e11-bf10-4b6e-a9be-5958a1adf5df X-Archives-Hash: 8b178b2639774134ed868447ea60b08e commit: 438e3912063d437bf8aa036f8812fdf4dd3cccde Author: NP-Hardass gentoo org> AuthorDate: Wed Apr 26 18:43:09 2017 +0000 Commit: NP Hardass gentoo org> CommitDate: Wed Apr 26 18:43:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438e3912 games-strategy/freeorion: Drop 0.4.6, update 9999, #604086 Fixes building with Boost 1.63 Package-Manager: Portage-2.3.5, Repoman-2.3.2 games-strategy/freeorion/Manifest | 1 - games-strategy/freeorion/freeorion-0.4.6.ebuild | 83 ------------------------- games-strategy/freeorion/freeorion-9999.ebuild | 10 +-- 3 files changed, 3 insertions(+), 91 deletions(-) diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest index a4b1e956c97..d4c501817d0 100644 --- a/games-strategy/freeorion/Manifest +++ b/games-strategy/freeorion/Manifest @@ -1,2 +1 @@ -DIST freeorion-0.4.6.tar.gz 145720274 SHA256 3e3ff3a758c8a1ffa71773dff18faff2c792051bb5162758b5f5b8ea59e8e311 SHA512 0488e36286358e8db2dcfe0cdae68e4638388fd2d4c627a258cdecf0afd57e9dbac03111f7683c3ef22edecbedd197a172d177400ddbb585a50f34804a50c50a WHIRLPOOL 30d56a2ca76158168492aa0d1b3fe5a9f164afd7dc378128fe2796ce149a9d65a64cd10c41c5b6c1510773e9ead564dff452869e6c384d949cd0789a51198b6c DIST freeorion-0.4.7_rc2.tar.gz 105944237 SHA256 6f9d2dd30609e65982fef197f4c64553e196a2c30dd9bae9db6b02758dd85191 SHA512 f703ae2e79d0ec1ba6217ff4de7fe443476ee280437f28e545286bfce7d20add5886c7275672091df2374222d03d535513a7d68db4e9bcc08bd72f1b28ca29d3 WHIRLPOOL c77c19f49c91452328c0b841f9bc127ab3c347963cd54582cd0fe587cc773565e6eec7e8cd3f1f30f7c690c24868029185e2c75bef32dcb53b25772bb1c1b0fd diff --git a/games-strategy/freeorion/freeorion-0.4.6.ebuild b/games-strategy/freeorion/freeorion-0.4.6.ebuild deleted file mode 100644 index cd26c01d3e8..00000000000 --- a/games-strategy/freeorion/freeorion-0.4.6.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils python-any-r1 gnome2-utils - -DESCRIPTION="A free turn-based space empire and galactic conquest game" -HOMEPAGE="http://www.freeorion.org" - -RELDATE=2016-09-16 -SHA=49f9123 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v${PV}_${RELDATE}.${SHA}_Source.tar.gz -> ${P}.tar.gz" -# Issue with version.cpp, TODO fix -#SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - >=dev-libs/boost-1.56[python,threads] - media-libs/freealut - media-libs/freetype - media-libs/glew:* - media-libs/libsdl2 - >=media-libs/libogg-1.1.3 - media-libs/libpng:0 - media-libs/libsdl2[X,opengl,video] - >=media-libs/libvorbis-1.1.2 - media-libs/openal - sci-physics/bullet - sys-libs/zlib - virtual/opengl - !dev-games/gigi" - # Use bundled gigi as of freeorion-0.4.3 - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig" - -S="${WORKDIR}/src-tarball" - -PATCHES=( "${FILESDIR}/${P}-boost-1.62.patch" ) - -pkg_setup() { - # build system is using FindPythonLibs.cmake which needs python:2 - python-any-r1_pkg_setup -} - -src_prepare() { - sed -e "s/-O3//" -i CMakeLists.txt || die - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DRELEASE_COMPILE_FLAGS="" - -DCMAKE_SKIP_RPATH=ON - ) - - append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc ChangeLog.md - - newenvd "${FILESDIR}/${PN}.envd" 99${PN} -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild index a790572fcaf..1be8614838d 100644 --- a/games-strategy/freeorion/freeorion-9999.ebuild +++ b/games-strategy/freeorion/freeorion-9999.ebuild @@ -13,14 +13,10 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/freeorion/freeorion.git" else - RELDATE=2016-09-16 - SHA=49f9123 - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/FreeOrion_v${PV}_${RELDATE}.${SHA}_Source.tar.gz -> ${P}.tar.gz" - # Issue with version.cpp, TODO fix - #SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + MY_PV="${PV/_/-}" + SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - - S="${WORKDIR}/src-tarball" + S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"