[gentoo-commits] repo/gentoo:master commit in: games-puzzle/construo/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/construo/

[Michael Sterrett]

commit:     bb5fecaf6d2eac58348ccf353a4930f0e147be88
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 05:22:10 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 05:22:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5fecaf

games-puzzle/construo: use default install

Package-Manager: portage-2.2.24

 games-puzzle/construo/construo-0.2.2.ebuild | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
index 07653eb..0f8df9f 100644
--- a/games-puzzle/construo/construo-0.2.2.ebuild
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -22,8 +22,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-lGLU.patch
+	sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
 	eautoreconf
 }
 
@@ -32,9 +34,6 @@ src_configure() {
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		bindir="${GAMES_BINDIR}" install
-	dodoc AUTHORS NEWS README TODO
+	default
 	prepgamesdirs
 }

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/construo/

[David Seifert]

commit:     a1264b5ff3d7341248b30ca7e7bd82a7a9f658ce
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Thu Jul  8 08:46:00 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 08:46:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1264b5f

games-puzzle/construo: use correct AR

Closes: https://github.com/gentoo/gentoo/pull/21557
Closes: https://bugs.gentoo.org/801073
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-puzzle/construo/construo-0.2.3.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-puzzle/construo/construo-0.2.3.ebuild b/games-puzzle/construo/construo-0.2.3.ebuild
index 9e99b41dbdc..89c4de46b05 100644
--- a/games-puzzle/construo/construo-0.2.3.ebuild
+++ b/games-puzzle/construo/construo-0.2.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop
+inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
 HOMEPAGE="http://www.nongnu.org/construo/"
@@ -31,6 +31,10 @@ src_prepare() {
 	eautoreconf
 }
 
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
 src_install() {
 	default
 	make_desktop_entry "${PN}.glut" "${PN}.glut"

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/construo/

[Sam James]

commit:     493d545eb75a4cb1672a2377211b4dbb6fe3488b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 22:51:22 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:33:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493d545e

games-puzzle/construo: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-puzzle/construo/construo-0.2.3.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/games-puzzle/construo/construo-0.2.3.ebuild b/games-puzzle/construo/construo-0.2.3.ebuild
index 89c4de46b053..740a6c5787db 100644
--- a/games-puzzle/construo/construo-0.2.3.ebuild
+++ b/games-puzzle/construo/construo-0.2.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit autotools desktop toolchain-funcs
 
 DESCRIPTION="2d construction toy with objects that react on physical forces"
@@ -12,12 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	media-libs/freeglut
+RDEPEND="media-libs/freeglut
 	virtual/glu
 	virtual/opengl
-	x11-libs/libXxf86vm
-"
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
@@ -32,11 +31,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake AR=$(tc-getAR)
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
 	default
-	make_desktop_entry "${PN}.glut" "${PN}.glut"
-	make_desktop_entry "${PN}.x11" "${PN}.x11"
+
+	make_desktop_entry ${PN}.glut ${PN}.glut
+	make_desktop_entry ${PN}.x11 ${PN}.x11
 }