gentoo resync : 03.03.2021

5 files changed, 107 insertions, 52 deletions

diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
index dc6e1b85b156..15fa2de7db5f 100644
--- a/games-arcade/opensonic/Manifest
+++ b/games-arcade/opensonic/Manifest
@@ -1,4 +1,6 @@
-AUX opensonic-0.1.4-r1-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
+AUX opensonic-0.1.4-allegro-4.4.2-loggcompat.patch 1416 BLAKE2B 1c8ff37145b488914dd94151320bd0848a3a7e367bcd0f2769c4ed13c36c93ee6d22206a6cec342eab557429ef37f42980454ad66254f35c509f97f7317a4b0b SHA512 afc96537bf04a8beab47fb6ec3c3cd25233df6c4f8f0f7ea7bbb50e7cdfbe126fae878747896a543d12297a1a7d16be42ae800989cfcf7152092fc06ad2b0ad2
+AUX opensonic-0.1.4-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
+DIST loggcompat-4.4.2.tar.gz 3105 BLAKE2B 846430f7a7252ee4de168274b21c9ffd18e9ba40733aaa45def8a8a4a7a938d00ab61267712008bc599ce91d5a283ab586a4dae77c3cd33af10e2dc641b8be12 SHA512 4d704f999fc3ae3caa094a8a32d5285549c40485c7af9015dc67f832255f2d3963ae1d0db9194b101d66a168b85609ec4926b8ebb39fb7ce7986f7df40f293af
 DIST opensnc-src-0.1.4.tar.gz 10525059 BLAKE2B d5cb825512dfeb614d146e6e7ec45cc3eb56dae0f2cf6c2582e022a1e8ac54e6c87f7bee8795b0e520fa6c24433cb7a748889892cd288f122d7b885e6e91c790 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d
-EBUILD opensonic-0.1.4-r2.ebuild 1219 BLAKE2B 705624d47ac5464a2de067b4e113cd2dbb5a6aa5c73b5d22700b643b2566f4214f182ec464726fa49fc0430a62e1f320847ff98737788471c817f0d710de010a SHA512 50c39b104eb0fc2cee336263ceb8ae8c7ff8029b19e4660afde6f6dfc2f1b50c0e14b4ff5882040a4a8ce7271892149a53565f0c207f7a16c168036a66a3247c
+EBUILD opensonic-0.1.4-r3.ebuild 1452 BLAKE2B 5a551e5809c08434fdd003fb71a36d26db03f6fbcc7f05e34dec288f61c6f9a84640b98cfa1551965495aa0d8681e013034ebd791ac7219b64226973fb27b40e SHA512 e05efcc86350804c89088c11b25fc2878d0c971d293fb48f782d8eec1838e6d7a67dd0f5ae9ec62173b44d7279b53712e79f4ac5d1baf18b1994eed49b39ab80
 MISC metadata.xml 330 BLAKE2B b93fe5bb5919cb60eb4e5f2179880bdd9848b9a5b33c368815feea1ee36d36494e169cd8839bedc2db9d15dea8d819d2ad6398769fa69ae7d61a2b142228caf2 SHA512 5ac408fe48351e3db869e0cf5af951fd441690505d16d826c4010d2d575fde0b7de6f9f9ef2594cd2006692e0682b2e62f8cb5726db5c80bc7974f942b7cd79c
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch
new file mode 100644
index 000000000000..1289e846fe2b
--- /dev/null
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-allegro-4.4.2-loggcompat.patch
@@ -0,0 +1,46 @@
+Source: FreeBSD
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,12 +82,6 @@ IF(NOT LJPGALLEG)
+   MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}")
+ ENDIF(NOT LJPGALLEG)
+ 
+-# LOGG: liblogg, libogg, libvorbis, libvorbisfile
+-FIND_LIBRARY(LLOGG NAMES logg PATH "${CMAKE_LIBRARY_PATH}")
+-IF(NOT LLOGG)
+-  MESSAGE(FATAL_ERROR "Fatal error: liblogg not found! ${RTFM}")
+-ENDIF(NOT LLOGG)
+-
+ FIND_LIBRARY(LOGG NAMES ogg PATH "${CMAKE_LIBRARY_PATH}")
+ IF(NOT LOGG)
+   MESSAGE(FATAL_ERROR "Fatal error: libogg not found! ${RTFM}")
+@@ -150,6 +144,7 @@ SET(
+   src/core/util.c
+   src/core/v2d.c
+   src/core/video.c
++  loggcompat-4.4.2/logg-4.4.2.c
+ 
+   src/scenes/util/editorgrp.c
+   src/scenes/util/grouptree.c
+@@ -250,7 +245,8 @@ IF(UNIX)
+ IF(UNIX)
+   SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c)
+   ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS})
+-  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS})
++  INCLUDE_DIRECTORIES(loggcompat-4.4.2)
++  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS})
+   SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall")
+ ENDIF(UNIX)
+ 
+--- a/src/core/audio.c
++++ b/src/core/audio.c
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <allegro.h>
+-#include <logg.h>
++#include <logg-4.4.2.h>
+ #include <stdlib.h>
+ #include "audio.h"
+ #include "osspec.h"
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch
index 53d76faafae2..53d76faafae2 100644
--- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
+++ b/games-arcade/opensonic/files/opensonic-0.1.4-cmake.patch
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
deleted file mode 100644
index 3e0e1b0c35a2..000000000000
--- a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN=opensnc
-MY_P=${MY_PN}-src-${PV}
-
-DESCRIPTION="A free open-source game based on the Sonic the Hedgehog universe"
-HOMEPAGE="http://opensnc.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror" # unsure about legality of graphics
-
-DEPEND="
-	media-libs/allegro:0=[X,jpeg,png,vorbis]
-	media-libs/libogg:=
-	media-libs/libpng:0=
-	media-libs/libvorbis:=
-	sys-libs/zlib:=
-	virtual/jpeg:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
-		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
-		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		dosym ../../share/${PN}/${f##*/} \
-			/usr/$(get_libdir)/${PN}/${f##*/}
-	done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
-}
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
new file mode 100644
index 000000000000..3aee65163017
--- /dev/null
+++ b/games-arcade/opensonic/opensonic-0.1.4-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Free open-source game based on the Sonic the Hedgehog universe"
+HOMEPAGE="http://opensnc.sourceforge.net/home/index.php"
+SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz
+	https://github.com/t6/loggcompat/archive/4.4.2.tar.gz -> loggcompat-4.4.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror" # unsure about legality of graphics
+
+DEPEND="
+	media-libs/allegro:0=[X,jpeg,png,vorbis]
+	media-libs/libogg:=
+	media-libs/libpng:0=
+	media-libs/libvorbis:=
+	sys-libs/zlib:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/opensnc-src-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-allegro-4.4.2-loggcompat.patch # bug 711542
+)
+
+src_prepare() {
+	mv "${WORKDIR}"/loggcompat-4.4.2 . || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
+		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
+		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		-DGAME_HTMLDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		dosym ../../share/${PN}/${f##*/} /usr/$(get_libdir)/${PN}/${f##*/}
+	done < <(find "${ED}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
+}