3 files changed, 40 insertions, 38 deletions
diff --git a/games-arcade/circuslinux/Manifest b/games-arcade/circuslinux/Manifest
index ae3d9a5de4fe..90516fb75405 100644
--- a/games-arcade/circuslinux/Manifest
+++ b/games-arcade/circuslinux/Manifest
@@ -1,3 +1,3 @@
 DIST circuslinux-1.0.3.tar.gz 1253839 BLAKE2B 1f0b57e417144b88688b2f900efebd95d35d7656a16a1b074197e0bd1fb33de3434582ac66e3bf996e7f1fbaafaefadc5091967696eecfcbbdf4a1c2316e0d17 SHA512 292bcaad39342ad69862f1add36b11505ca5f2601637a8db6fad438c5a4b32d7801bc7e6c08b903b0fb8bf68dcb3ec8d968fb913cde65941b9b9ac64b5a5266f
-EBUILD circuslinux-1.0.3-r1.ebuild 775 BLAKE2B db816b156f1ee60a4ec1cd5ab0ab7e5801392222b70b3c2780e385b7ea2056f6d78a797130cd17fac1831f77d8900047c8b798acbe2e0ca3a4dd2afd99e6da6e SHA512 bca4aa9664d722f72cda03396583eccb04e27d9da5a5835a71a3628f1f02b798d6c6fa14ae522ea27190f9ca20a420e630febb7e68f930bdd9b6166cded65963
+EBUILD circuslinux-1.0.3-r2.ebuild 894 BLAKE2B c3edb7eeaeb2974cb4a71d9ec872d82198f2c7d5cb570dbf851958ce817d2db00ddfd5d3a47430cacce5e741548352fcd4e10e84cbfc244d81922a71f9625807 SHA512 8efa8300680026f841a888a976b2056f6afb7c9df09894f2481d04893eb9f55a771bb8fefd2a53e55de1c3d8fd9a9a6e95e19091ee71a96d4c7025e1fe362f5b
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
deleted file mode 100644
index 1001c7c8aeba..000000000000
--- a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="clone of the Atari 2600 game \"Circus Atari\""
-SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/${P}.tar.gz"
-HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^install-data-am/d" \
-		Makefile.in \
-		|| die
-	sed -i \
-		-e 's/\$(pkgdatadir)/$(DESTDIR)&/' \
-		data/Makefile.in \
-		|| die
-}
-
-src_install() {
-	default
-	newicon data/images/${PN}-icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Circus Linux!"
-}
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..cc14d4936470
--- /dev/null
+++ b/games-arcade/circuslinux/circuslinux-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Clone of the Atari 2600 game \"Circus Atari\""
+SRC_URI="ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/${P}.tar.gz"
+HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i 's/-O2//' Makefile.in || die
+	sed -i 's/$(pkgdatadir)/$(DESTDIR)&/' data/Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC
+	econf --enable-joystick
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+
+	newicon data/images/${PN}-icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Circus Linux!"
+}