gentoo auto-resync : 12:08:2022 - 02:20:53

6 files changed, 87 insertions, 105 deletions

diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest
index 8f3211d719ed..e419d281aace 100644
--- a/games-arcade/conveysdl/Manifest
+++ b/games-arcade/conveysdl/Manifest
@@ -1,5 +1,7 @@
-AUX conveysdl-1.3-arrays.patch 997 BLAKE2B 6a243b48ee809c86a02a6c49117a0e86a1b0dbce80cb9c761e693b66a576536b92ffb1c61e0bb3676d2b6850f1b8985d52d0c0d67de4bf9e6aaf186fed2e1bac SHA512 c4d52d0da7bedb4941d7438203e7c1d25d72960ab739e1a4c359628424a95f95001340b74b7926ae22c7c837f2f7a241891381f16c3a15f75e51ad908cc6b56e
-AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 2e0716f1a40e2a42cd9e30e3154f3b79dd4691e97a530761d8f4b6d3f1069382c5e430b56df5f60928f1c249257652c8c4b5800ba08a5d6881bd9d8267dfd378 SHA512 8766d4c522b58f9def8d7f1a9b928287643068daf6594fde91ba1fe9aa6363eea36958d98ca3aa40eead761eda7a253209cf74143b4a6333f2e0ed9bdc116fbf
+AUX conveysdl-1.3-arrays.patch 757 BLAKE2B d5a54bf0bbc751c631f3aefb62a316f45710b9b3e1e4a114f932217b4f6eacc02bcec0a4cded626e08e738e9fb30df9dfc46a944d6bef83b06079d1ec2deeb00 SHA512 1e78cc3053085b8a352d57c964d2509b98f54efdf00bb63ee1988c85b392c6364835757eef687caeec517de856d0b55b55b6efe610731d38f1d71bd4f52d03ce
+AUX conveysdl-1.3-audio.patch 323 BLAKE2B abc409c5c369aed932c020f58271918f76f00088b44d3f25d8cba6f72333b9d47c43c4d9eccdab543de67b3c5d6ec667615102ee7c85e04a953687de6ea29468 SHA512 7974f0fd495767e4211866898ffff2f7517aa6e2e52fb489c812f52c4a458bcf9ccd8e4b57d1a752a46ce8044bbe25788d07bdf077473f94fe974449b0c98176
+AUX conveysdl-1.3-speed.patch 980 BLAKE2B c8909d766aaea88f80f0d2ff778f8b9eb2e3e7e1db9773836fa53beff91d68ba3479cbf15ce0a76c6b27f2eee53726ba789510846f6f48cd3fbe21fb806ca7af SHA512 0526e9260b7b72b16e463f02de379e47f05f725dd0a41dbab073b8f99a171e36274e87d96625f9d8bc504bcfcbc58c526291d81a14c142f744d9d21b280f870e
 DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a
-EBUILD conveysdl-1.3-r1.ebuild 1182 BLAKE2B c1cb698ccf522954912d7c83c68c3504cbf214e617d5297c656ce6c4b7da0a263ee564583957cf9327bf629a4a46dcb3a936c69cbb3de1c6c865915fa3f626ac SHA512 d3208c340112cdced7d2309548266842ea8ee936f1e26358e479a67684365722fbe893d858f8935f91501f2990c02b1f3c4f5411ee5f5aefd8b1bb051a72a5f9
+DIST conveysdl.png 328 BLAKE2B a62da06757da9e103e7156a5fbda7b9a7e0381aa6d203fe4ed7e46568073eef6287a955303a227975f9e073dbab3bad990a8033200da204059887bb8078203c8 SHA512 dcf99bc5112189a5d33a183a8a6ecad3b70456a75112a3caece1d87f967fcb14279f6a2f9a47dc67967806c09b5725cb2f239c29be9370336c0f76bed4db1867
+EBUILD conveysdl-1.3-r2.ebuild 1113 BLAKE2B a1ba37672517d336b58d5b2ede87aa49b77e6ad4749cf2622406cfe288afe3409fd0a884763e6b9ddc6d06739837319381615eba98625d852a7f65a893b32dc7 SHA512 067bcb64c8b7c011f2c91491729d09b05c9a4a2a243ac160bafae3c4a0ea5e3dd97da12c18b6806358fbcde59def38852ebeaca40ebde6e6a8fdf0de438d30a0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
deleted file mode 100644
index 904ee87c07b4..000000000000
--- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
-HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/"
-SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# Incomplete readme
-	sed -i \
-		-e 's:I k:use -nosound to disable sound\n\nI k:' \
-		readme || die
-
-	sed -i \
-		-e 's:SDL_Mi:SDL_mi:' \
-		main.c || die
-
-	eapply \
-		"${FILESDIR}"/${P}-arrays.patch \
-		"${FILESDIR}"/${P}-speed.patch
-}
-
-src_compile() {
-	emake main \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} $(sdl-config --cflags) \
-			-DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
-			-DENABLE_SOUND" \
-		LDLIBS="-lSDL_mixer $(sdl-config --libs)"
-}
-
-src_install() {
-	newbin main ${PN}
-	insinto /usr/share/${PN}
-	doins -r gfx sounds levels
-	newicon gfx/jblob.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
new file mode 100644
index 000000000000..a45ec62f1a9e
--- /dev/null
+++ b/games-arcade/conveysdl/conveysdl-1.3-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${P/-/.}.tar
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arrays.patch
+	"${FILESDIR}"/${P}-audio.patch
+	"${FILESDIR}"/${P}-speed.patch
+)
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \
+		-DDATA_PREFIX="'\"${EPREFIX}/usr/share/${PN}/\"'" \
+		-DENABLE_SOUND
+	append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die)
+
+	emake main LDLIBS="${LIBS}"
+}
+
+src_install() {
+	newbin main ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r gfx levels sounds
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Convey
+
+	dodoc readme
+}
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
index a6286d96f145..b733159425e6 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -1,29 +1,18 @@
---- a/main.c.org	2010-07-28 13:16:20.552161148 +0300
-+++ b/main.c	2010-07-29 20:43:14.714543259 +0300
-@@ -22,7 +22,7 @@
- 
- SDL_Surface *bletters;
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -24,3 +24,3 @@
  SDL_Surface *letters[100];
 -SDL_Surface *tiles[9];
 +SDL_Surface *tiles[10];
  SDL_Surface *btiles;
- SDL_Surface *blob;
- SDL_Surface *jblob;
-@@ -51,7 +51,7 @@
- FILE *file_ptr;
- 
+@@ -53,3 +53,3 @@
  
 -int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -452,7 +452,7 @@
- static void info(void)
- {
+@@ -454,3 +454,3 @@
    int monkey=70,munk;
 -  char scoremonkey[10];
 +  char scoremonkey[16];
    if (lives>1) {
-     for (munk=1 ; munk<lives ; munk++ )
-     {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
new file mode 100644
index 000000000000..9f76cb2dc0a9
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-audio.patch
@@ -0,0 +1,15 @@
+Fix header and add lacking instructions to readme.
+--- a/main.c
++++ b/main.c
+@@ -8,3 +8,3 @@
+ #ifdef ENABLE_SOUND
+-#include <SDL_Mixer.h>
++#include <SDL_mixer.h>
+ static int soundv = 2;
+--- a/readme
++++ b/readme
+@@ -6,2 +6,4 @@
+ 
++use -nosound to disable sound
++
+ I knocked this game up over a couple of days, and can't be
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
index 6d6d13eb11be..06d518597d94 100644
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -1,31 +1,20 @@
---- a/main.c	2010-07-30 10:41:21.392783010 +0300
-+++ b/main.c	2010-07-30 10:44:35.791690958 +0300
-@@ -52,6 +52,7 @@
- 
- 
+https://bugs.gentoo.org/330161
+--- a/main.c
++++ b/main.c
+@@ -54,2 +54,3 @@
  int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
 +int realspeed;
  /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -140,6 +141,7 @@
-   char path[256],jib[50];
-   int lvspx,lvspy;
+@@ -142,2 +143,3 @@
    bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4;
 +  realspeed=speed;
    strcpy(path, DATA_PREFIX);
-   sprintf(jib,"levels/level%d",level);
-   strcat(path, jib);
-@@ -212,15 +214,16 @@
-     if (jumpf==jumpoo) { jump=0; }
-     if (jumpf==jumpoo*2) { jumpf=0; }
+@@ -214,3 +216,3 @@
    }
 -  score+=speed;
 +  score+=realspeed;
    /*crap*/
- }
- 
- static void plotfloor(void)
+@@ -220,5 +222,6 @@
  {
 +  if (bpointy==400) realspeed=speed;
    int nob,nx,nobx=48,ek,ej,el;
@@ -34,23 +23,13 @@
 +  bpointx-=realspeed*2;
 +  bpointy+=realspeed;
    pointx=bpointx;
-   pointy=bpointy;
-   imageplot(bb, blobx[6], bloby[6] );
-@@ -542,7 +545,7 @@
-   }
-   while ( jump_down==0 );
+@@ -544,3 +547,3 @@
    leveldone=3;
 -  speed=4;
 +  speed=4; realspeed=speed;
     blankscreen();
- }
- 
-@@ -563,7 +566,7 @@
-    if (quit>0) break;
-   }
+@@ -565,3 +568,3 @@
    while ( jump_down==0 );
 -  speed=4;
 +  speed=4; realspeed=speed;
    lives+=1;
-   level+=1;
-   getlevel();