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 EF955139086 for ; Mon, 26 Dec 2016 17:04:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9A3121C039; Mon, 26 Dec 2016 17:04:56 +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 C4023E0C11 for ; Mon, 26 Dec 2016 17:04:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A67C9341293 for ; Mon, 26 Dec 2016 17:04:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D517524C5 for ; Mon, 26 Dec 2016 17:04:53 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1482771881.1c7ef6b6bc70db1f1abf899373f4b37284309fcf.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/openttd/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-simulation/openttd/openttd-1.6.1-r1.ebuild games-simulation/openttd/openttd-1.6.1.ebuild X-VCS-Directories: games-simulation/openttd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1c7ef6b6bc70db1f1abf899373f4b37284309fcf X-VCS-Branch: master Date: Mon, 26 Dec 2016 17:04:53 +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: 36dd2c58-d353-47f5-ba81-7092ca0df670 X-Archives-Hash: a1bc6b4ca4436bc85d0779a673629743 commit: 1c7ef6b6bc70db1f1abf899373f4b37284309fcf Author: Alexander Golubev gmail com> AuthorDate: Sun Dec 25 19:45:31 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 26 17:04:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7ef6b6 games-simulation/openttd: install data to /usr/share/games Gentoo-Bug: 600272 + some configure args cleanup Closes: https://github.com/gentoo/gentoo/pull/3242 .../openttd/{openttd-1.6.1.ebuild => openttd-1.6.1-r1.ebuild} | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/games-simulation/openttd/openttd-1.6.1.ebuild b/games-simulation/openttd/openttd-1.6.1-r1.ebuild similarity index 94% rename from games-simulation/openttd/openttd-1.6.1.ebuild rename to games-simulation/openttd/openttd-1.6.1-r1.ebuild index bac156e..a0c62ed 100644 --- a/games-simulation/openttd/openttd-1.6.1.ebuild +++ b/games-simulation/openttd/openttd-1.6.1-r1.ebuild @@ -89,15 +89,9 @@ src_configure() { # It's all built as C++, upstream uses CFLAGS internally. CFLAGS="" ./configure \ --disable-strip \ - --prefix-dir="${EPREFIX}" \ - --binary-dir="/usr/bin" \ - --data-dir="/usr/share/${PN}" \ + --prefix-dir="${EPREFIX}/usr" \ + --binary-dir="bin" \ --install-dir="${D}" \ - --icon-dir=/usr/share/pixmaps \ - --menu-dir=/usr/share/applications \ - --icon-theme-dir=/usr/share/icons/hicolor \ - --man-dir=/usr/share/man/man6 \ - --doc-dir=/usr/share/doc/${PF} \ --menu-group="Game;Simulation;" \ ${myopts[@]} \ $(use_with iconv) \