gentoo resync : 19.11.2017

3 files changed, 83 insertions, 83 deletions

diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index d890c168fabb..64cbddc7fc5c 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,6 +1,6 @@
 DIST hedgewars-src-0.9.22.tar.bz2 160103313 SHA256 b699c8971ff420c3edd6533527ae2e99040f1e79207c9140826945bcf0e62192 SHA512 753cccef09b725048d9e66988b03859a12e577a601656cc2b3dbb2755c59ed9ae4d4c88c9247238408fc76d881c921593a694a58a500b3d5b8c9a4c0cfb053ac WHIRLPOOL c8003da8d1435f4bece344a593bda9b214a24b35ee662310245e13cabc5f35820a38f9ac0883ba5543db413189491f6c3da37b7452034bfa9fb04e8936f52e27
 DIST hedgewars_0.9.22-dfsg-7.debian.tar.xz 79016 SHA256 7c57376a4f85ff33bf9345b46a4df72d70fe9824b8fd7df68b62107dbb8bb5cb SHA512 011d44989b6fcad9ae7a20fcb11a4e2b9a75d1ace6c6e4c2139cd7e67f13ea21d90b6c8a7afb76fa9a06c32537b00b8b4b7689967b3019300e93a7a6fe3e0fbf WHIRLPOOL a8a769b5275b6adec26dce48c113c4a5eb1c69eee9a01e181ec41b611e999a33349bad2b52eaf72099b1dbfce14a1af6e559aaceb3e2ac98ab04065c61bffca7
-EBUILD hedgewars-0.9.22-r1.ebuild 2159 SHA256 e2310efe4ddc60bed33c2276128c07d8992a26d0d4786ca9af685da4f31e8081 SHA512 3f7c300052cfc01e53ea4f6af00f85040201c4737f4681292ae668b8051ba4f898ad19f118f769e5b62f5a5337c7f51b7526e7caa9f9c3715ab559453d86030c WHIRLPOOL ca01be4aa770252a16136d23e398dbbff252b01e0b4bf60cd888b7270de4555543259954dd4d73d3e80bf1bc0f13c75d14713bf1751d56db1d3956ea162b2df0
+EBUILD hedgewars-0.9.22-r2.ebuild 2083 SHA256 ee6a74dfa0709cf9fb446eea2c36ee590dfd0dbf114d624e47c608560f051f33 SHA512 7655400a38c770bc6397c2a400c41cbac4be27be32ba01e92b2ac849bd23a8e26c0dcbad36d97c5d4fda97bd21f4343dba223fa07270d510a8adaac9bb3b78c3 WHIRLPOOL 5c149a4a8d22ecd327ac80f09007e8a6e6bdfb8055c5a0571ad77b7e24c30031053bfa2f3fe509072d367c1ae9b007c40ccb3076740f2b038c86362b9bf55b4e
 MISC ChangeLog 4030 SHA256 1a323a5e882d4fde594c29abaebf23999407cc5cbb638745b888fc3b9e80d248 SHA512 c5dc8595523219594b1c2ee907243e744ceab152112c67c883aee62b2cb0994d86967e50d9054da1e82b631a285a9e3be89d30a97ba589bda7e0af18e6c27eac WHIRLPOOL 76749404a0a372c879a00e5375ae175c15bd4b5d3c3b91b5df42473e48d031d660d3e77bfb49cbd6c3181c587880b329dd976a2431506677efc0361190fff854
 MISC ChangeLog-2015 10076 SHA256 b39f6b35a33e0647e33a95d42b9ddea11ae4fbf65d4e01c75661d1028045ebb7 SHA512 3355d7730828a131b2374a39d0f790247d9dc5851f5ce1345f6dd933f73e95efff841d939f6abe35af5854b5ecfad65b9576721e33c259a1d580a3a138b08c71 WHIRLPOOL a547d1848d08f991184d9543fd4e41855be84a6a068bd3489be747cfa2fbe2bbc73f149ebd978cbd8a48fcb67fc2dfa6de1d30f908a997f46566cccc5991b1e7
 MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
deleted file mode 100644
index 09cb7e297c09..000000000000
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: when physfs-2.1.0 hits the tree, set
-# -DPHYSFS_SYSTEM=ON
-
-EAPI=5
-CMAKE_BUILD_TYPE=Release
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils eutils games
-
-MY_P=${PN}-src-${PV}
-DEB_PATCH_VER=7
-DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
-HOMEPAGE="http://hedgewars.org/"
-SRC_URI="http://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
-	mirror://debian/pool/main/h/${PN}/${PN}_${PV}-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="GPL-2 Apache-2.0 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-QA_FLAGS_IGNORED=${GAMES_BINDIR}/hwengine # pascal sucks
-QA_PRESTRIPPED=${GAMES_BINDIR}/hwengine # pascal sucks
-
-RDEPEND="
-	dev-lang/lua:0=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/freeglut
-	media-libs/libpng:0
-	media-libs/libsdl[sound,opengl,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/ffmpeg"
-DEPEND="${RDEPEND}
-	>=dev-lang/fpc-2.4"
-RDEPEND="${RDEPEND}
-	app-arch/xz-utils
-	media-fonts/wqy-zenhei
-	>=media-fonts/dejavu-2.28"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/debian/patches" \
-		epatch $(cat "${WORKDIR}/debian/patches/series")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMINIMAL_FLAGS=ON
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		-DDATA_INSTALL_DIR="${GAMES_DATADIR}/${PN}"
-		-Dtarget_binary_install_dir="${GAMES_BINDIR}"
-		-Dtarget_library_install_dir="$(games_get_libdir)"
-		-DNOSERVER=TRUE
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DPHYSFS_SYSTEM=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="ChangeLog.txt README" cmake-utils_src_install
-	rm -f "${D}"/usr/share/games/hedgewars/Data/Fonts/{DejaVuSans-Bold.ttf,wqy-zenhei.ttc}
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
-		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/DejaVuSans-Bold.ttf
-	dosym /usr/share/fonts/wqy-zenhei/wqy-zenhei.ttc \
-		"${GAMES_DATADIR}"/hedgewars/Data/Fonts/wqy-zenhei.ttc
-	doicon misc/hedgewars.png
-	make_desktop_entry ${PN} Hedgewars
-	doman man/${PN}.6
-	prepgamesdirs
-}
diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
new file mode 100644
index 000000000000..d7016bea411e
--- /dev/null
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils eutils
+
+MY_P=${PN}-src-${PV}
+DEB_PATCH_VER=7
+
+DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
+HOMEPAGE="https://www.hedgewars.org/"
+SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
+	mirror://debian/pool/main/h/${PN}/${PN}_${PV}-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
+
+LICENSE="GPL-2 Apache-2.0 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
+QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
+
+CDEPEND="
+	>=dev-games/physfs-3.0.1
+	dev-lang/lua:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/freeglut
+	media-libs/libpng:0=
+	media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/zlib:=
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:= )"
+DEPEND="${CDEPEND}
+	>=dev-lang/fpc-2.4"
+RDEPEND="${CDEPEND}
+	app-arch/xz-utils
+	media-fonts/wqy-zenhei
+	>=media-fonts/dejavu-2.28"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	while IFS="" read -r f ; do
+		PATCHES+=( "${WORKDIR}/debian/patches/${f}" )
+	done < <(cat "${WORKDIR}/debian/patches/series")
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMINIMAL_FLAGS=ON
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
+		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
+		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
+		-DNOSERVER=TRUE
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DPHYSFS_SYSTEM=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm -f "${ED%/}"/usr/share/games/hedgewars/Data/Fonts/{DejaVuSans-Bold.ttf,wqy-zenhei.ttc} || die
+	dosym ../../../fonts/dejavu/DejaVuSans-Bold.ttf \
+		/usr/share/${PN}/Data/Fonts/DejaVuSans-Bold.ttf
+	dosym ../../../fonts/wqy-zenhei/wqy-zenhei.ttc \
+		/usr/share/${PN}/Data/Fonts/wqy-zenhei.ttc
+	doicon misc/hedgewars.png
+	make_desktop_entry ${PN} Hedgewars
+	doman man/${PN}.6
+}