Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/construo/files/, games-puzzle/construo/
Date: Wed, 07 Jul 2021 17:25:24
Message-Id: 1625678701.fbe4c9d5c5dcfb678b256741f158e02aa785ba2c.soap@gentoo
1 commit: fbe4c9d5c5dcfb678b256741f158e02aa785ba2c
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Wed Jul 7 17:25:01 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 7 17:25:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe4c9d5
7
8 games-puzzle/construo: drop old
9
10 Closes: https://github.com/gentoo/gentoo/pull/21553
11 Package-Manager: Portage-3.0.20, Repoman-3.0.2
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 games-puzzle/construo/Manifest | 1 -
16 games-puzzle/construo/construo-0.2.2-r1.ebuild | 38 ----------
17 .../construo/files/construo-0.2.2-gcc43.patch | 82 ----------------------
18 .../construo/files/construo-0.2.2-lGLU.patch | 18 -----
19 4 files changed, 139 deletions(-)
20
21 diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
22 index 39aea78122d..cb7daea6217 100644
23 --- a/games-puzzle/construo/Manifest
24 +++ b/games-puzzle/construo/Manifest
25 @@ -1,2 +1 @@
26 -DIST construo-0.2.2.tar.gz 442626 BLAKE2B c6c9c566c8e4014aba1e06d12af2c3c3076d533a9f11513e903a6fff027ecbd3b492c1ca35a50b42dbd0aea5064614147529f2dcfd6b75af2376a7a410fdc470 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9
27 DIST construo-0.2.3.tar.gz 585891 BLAKE2B 6970d9ce30553a72d59784d0e356705913fceaf8a7cf39873054f8122b29ffcda6757af8ce494fe989253e0e00de54d1d0c543d71403b65580ece6c1e8483be2 SHA512 b3b723e914fa3c08763b73cbd6ec340f70efefd28e2ff79e738cc5d71109304a90d2d0ddbd0277e587e4e134c5bd497dde15aebea2b318e5d3c07f339b769bf3
28
29 diff --git a/games-puzzle/construo/construo-0.2.2-r1.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
30 deleted file mode 100644
31 index 4370d583ab8..00000000000
32 --- a/games-puzzle/construo/construo-0.2.2-r1.ebuild
33 +++ /dev/null
34 @@ -1,38 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit autotools desktop
40 -
41 -DESCRIPTION="2d construction toy with objects that react on physical forces"
42 -HOMEPAGE="http://www.nongnu.org/construo/"
43 -SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.tar.gz"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~x86"
48 -IUSE=""
49 -
50 -RDEPEND="
51 - virtual/opengl
52 - virtual/glu
53 - media-libs/freeglut
54 - x11-libs/libXxf86vm
55 -"
56 -DEPEND="${RDEPEND}
57 - x11-base/xorg-proto"
58 -
59 -src_prepare() {
60 - default
61 - eapply \
62 - "${FILESDIR}"/${P}-gcc43.patch \
63 - "${FILESDIR}"/${P}-lGLU.patch
64 - sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
65 - eautoreconf
66 -}
67 -
68 -src_install() {
69 - default
70 - make_desktop_entry "${PN}.glut" "${PN}.glut"
71 - make_desktop_entry "${PN}.x11" "${PN}.x11"
72 -}
73
74 diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
75 deleted file mode 100644
76 index 48165ed21df..00000000000
77 --- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
78 +++ /dev/null
79 @@ -1,82 +0,0 @@
80 ---- a/command_line.cxx
81 -+++ b/command_line.cxx
82 -@@ -19,7 +19,9 @@
83 -
84 - #include <config.h>
85 - #include <iostream>
86 --#include <stdio.h>
87 -+#include <cstdio>
88 -+#include <cstdlib>
89 -+#include <cstring>
90 - #include "settings.hxx"
91 - #include "command_line.hxx"
92 -
93 ---- a/config.hxx
94 -+++ b/config.hxx
95 -@@ -21,6 +21,7 @@
96 - #define CONFIG_HH
97 -
98 - #include <string>
99 -+#include <cstdlib>
100 -
101 - class Config
102 - {
103 ---- a/lisp_reader.cxx
104 -+++ b/lisp_reader.cxx
105 -@@ -17,6 +17,7 @@
106 - // along with this program; if not, write to the Free Software
107 - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
108 -
109 -+#include <cstring>
110 - #include "construo_error.hxx"
111 - #include "lisp_reader.hxx"
112 -
113 ---- a/unix_system.cxx
114 -+++ b/unix_system.cxx
115 -@@ -17,8 +17,9 @@
116 - // along with this program; if not, write to the Free Software
117 - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
118 -
119 --#include <stdio.h>
120 --#include <assert.h>
121 -+#include <cstdio>
122 -+#include <cassert>
123 -+#include <cstring>
124 - #include <unistd.h>
125 - #include <sys/time.h>
126 - #include <time.h>
127 ---- a/vector.cxx
128 -+++ b/vector.cxx
129 -@@ -16,8 +16,8 @@
130 - totally replaced old CL_Vector with this code
131 - */
132 -
133 --#include <assert.h>
134 --#include <math.h>
135 -+#include <cassert>
136 -+#include <cmath>
137 - #include "vector.hxx"
138 -
139 - CL_Vector::CL_Vector(float x, float y, float z, float w)
140 ---- a/world.cxx
141 -+++ b/world.cxx
142 -@@ -17,7 +17,8 @@
143 - // along with this program; if not, write to the Free Software
144 - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
145 -
146 --#include <assert.h>
147 -+#include <cassert>
148 -+#include <cstring>
149 - #include <algorithm>
150 - #include "config.h"
151 -
152 ---- a/x11_display.cxx
153 -+++ b/x11_display.cxx
154 -@@ -19,6 +19,7 @@
155 -
156 - #include <config.h>
157 - #include <iostream>
158 -+#include <cstring>
159 - #include <X11/Xutil.h>
160 - #include <X11/cursorfont.h>
161 - #include <X11/keysym.h>
162
163 diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
164 deleted file mode 100644
165 index be8e7b604d6..00000000000
166 --- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
167 +++ /dev/null
168 @@ -1,18 +0,0 @@
169 ---- a/configure.ac.old 2009-11-24 18:27:48.000000000 +0100
170 -+++ b/configure.ac 2009-11-24 18:28:29.000000000 +0100
171 -@@ -114,7 +114,7 @@
172 - AC_CHECK_LIB(glut, glutMainLoop,
173 - [
174 - ConstruoTargets="$ConstruoTargets construo.glut"
175 -- AC_SUBST(glut_LIBS,"-lglut")
176 -+ AC_SUBST(glut_LIBS,"-lglut -lGLU -lGL -lm")
177 - ],
178 - [])
179 -
180 -@@ -158,4 +158,4 @@
181 - echo " Ingo Ruhnke <grumbel@×××.de>"
182 - echo ""
183 -
184 --# EOF #
185 -\ No newline at end of file
186 -+# EOF #