gentoo resync : 28.04.2021

6 files changed, 194 insertions, 42 deletions

diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
index cf594c2c7e76..b2f60cdf480a 100644
--- a/games-server/pvpgn/Manifest
+++ b/games-server/pvpgn/Manifest
@@ -1,6 +1,9 @@
-AUX pvpgn-1.8.5-fhs.patch 11549 BLAKE2B 7776e8df3d97238084664f6b3edca525445d7d4aafa3049897fbe2b4b069e768acbab9daf474f8ffcbd4e5375e2fcfca4b8bea0ec42ab62f557c08c708033933 SHA512 9842120682df08c34eada97712246b3c492be66e3e3bd10dfe744896f7c1c461da530ea90c819dff2de436017836bf4b107d46b0960d928e00004ab6381dbbd1
+AUX pvpgn-1.8.5-fhs.patch 10813 BLAKE2B 849e2094ec0d313494046310028c63d01fdf5f377a33ec0779968a9d509d42fa7dcfd58fc23fa13809eff7d6e0baf25d97a88822c4a4d41c1f97a087e1077ed8 SHA512 4bb6f66f8499fce973ec9de2f6d30fe82c3965fa8aba2c257063abe8bc65a274f35ad1cd0ddedf9915747be0361d7a33ca1dae5faf2e71227c85d64f28aa6ed5
+AUX pvpgn-1.99.7.2.1-path.patch 1038 BLAKE2B 126f82bc49978c495688e4609ea7a001bbe77cf8b9a80f66b71181fb28ef1d897958f6c9ffee17b5b4bd6297e23ba25e7d4d4413b433f3d136330b22387b7a1b SHA512 012445bc577cce40a6b1799d5b02d7403fd73e54830f5576eb373d781ec487d0cc2743f4ab3f22cf523119ffaa472f4584ba2108c7f803fbe204f066d866f638
 AUX pvpgn.rc 885 BLAKE2B c0739177a13a2bddbe3cc82ad7bf87ff313faf0882159f7475c223ec76ef164ba572b048d05683bd02756d121e97efb04ec34fbd53ad856a54f6c23663fec6a3 SHA512 4b0a5d52e50bfde317ab3d9689aef6491b0dc8e3e94576c8ee7376c2118e3a315555a66b2aecb086914aec055011b7687eb1bdfea266423071098ac1151d0cdf
 DIST pvpgn-1.8.5.tar.bz2 982931 BLAKE2B 73c84278c5a7a13b781541f49a77af45d05950f0e378237ec0bfce3b4a55a94f91cfc2f994f56046e76c3dfb5d390427ee9cecbc21d1da048d2c503bfa21cf7b SHA512 7cbe141efe03efa4ce0fc1cc3b4e15afe2e85e3c83a27afdf36fec9e2dadf1c7b9aca1773e6a3e6566b62f5a7999cc040c9517786ca70eeb70f86eea84e9218e
+DIST pvpgn-1.99.7.2.1.tar.gz 1515818 BLAKE2B b4f5017b58e91785b199b700ced9e54bc7d953f2fe12696c931d44e5cad93f86eb77cff8fdc429e7d033f19d93ae895c192ce4c5a73beb7812c2f27f94bbeaf3 SHA512 b3b042c739b15b8460d9e0da1ed9f1fb6fb2db39046a23d7d30290b47b31e41de6c152023f0ab6dd92ce0c7b7483e6933509bda216cb0cb1260b5eed0bc874dd
 DIST pvpgn-support-1.3.tar.gz 123805 BLAKE2B dc051265c6d4c5a2ab69379f7ac4a57f402d25e8898020217f2ae5f12cb2ca4db860df47efe38ed6494eb040cbd52a7ed495bc3dab59c9e9e48a8e1386500d6e SHA512 9002fcdb7da92e84af97319b9f1e38f5cf97466aef88549b1fe81b9070643f321011adf674424e2c4acc22f847c7fc61ca2cbf2da0223842e9b9e6c8f1427d76
-EBUILD pvpgn-1.8.5-r2.ebuild 2516 BLAKE2B c6cdad1ac897b79d9739efc3c9ae35ab4735808e194e4e55b07c36f85c327d2a8794297aa6890da4d5cee3fa2d9e7abcf3510aee9fb47e1e04e002a336d8977a SHA512 390d84cc85c5880c63d4daf794381b986cb11cdf4cee45d98828d389440dcc0cc2aaf627d1483400d058e9dc1e537d4af910879891de339bd3102322feaef2c5
-MISC metadata.xml 336 BLAKE2B c11b3fef92305d55a4881dddeb386549100c4e7b74227b12a19f59c720fe502e4ff4e55681150d5b24471ed1a27230c2e8fe5162ffda30812f66195ae541c5f0 SHA512 5f28f8c449006d87effadc3d9e8dc234fede927b9487dc1efa5c9912913b23c752fb7e7589dc3f466cdd91894a5d5b7ca8d155460e73f0ac9280ddaf011412aa
+EBUILD pvpgn-1.8.5-r4.ebuild 2434 BLAKE2B f466ddb175b3af77d8cd5c4d45fdeb32dba1eecb76c8f60b7997f339068cd66a7082d0e460da1b1fe38d073f37650fdfd806930b5ebd58b7ca00b1cf9ebdbfdc SHA512 8797306e15cff306a20bbf9b23b3d6e9634b58c8285b5c5aa77b02005804e70fa44aab955e88c809e76443473ae500fcc92179b8939c6415d948faef78367f4e
+EBUILD pvpgn-1.99.7.2.1-r1.ebuild 2746 BLAKE2B c6f8a790b11f475b2b48767aeea31c23ec6cfa948d14c67f948dd56153ae39eafca5c94632997863d485e3ec39a58d0adafc0685c3b5b129b2d09ab13202c168 SHA512 2e3df7446451608c5a9c2c1bd007b7aa115f70c6c39b4ddd1447d82a5e14ba25214b0e8b19cc589d7a0b6c5648a1165a3264b41c57f922b3bf0b9c066339623f
+MISC metadata.xml 394 BLAKE2B 8fa51071a8ae7a74a842361e1ea914e8416e32e585dbb67586f52c3ea85c4d807e6d7cd91071098718735445066301fbb0a745ce98bf2756ab071489774f1f82 SHA512 fe01053a24f4694184cd1c1e91a1536cf7d98ba7ba2d6fce597d092a339bee1f9ad87464a8cc79e14ab3ab2cabc1db9f7b23f5e8cc3bcb261beb987a3da6a170
diff --git a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch b/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
index d1450b3ad178..f4238450c414 100644
--- a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
+++ b/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
@@ -1,6 +1,5 @@
-diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.in
---- pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in	2005-09-19 08:17:50.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/bnetd.conf.in	2006-08-16 23:34:10.000000000 -0400
+--- a/conf/bnetd.conf.in
++++ b/conf/bnetd.conf.in
 @@ -50,22 +50,22 @@
  # - "prefix" : prefix to use for all pvpgn tables (default "")               #
  #                                                                            #
@@ -94,9 +93,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.
  
  fortunecmd  = /usr/games/fortune
  
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in	2005-09-29 01:37:33.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2cs.conf.in	2006-08-16 23:35:43.000000000 -0400
+--- a/conf/d2cs.conf.in
++++ b/conf/d2cs.conf.in
 @@ -86,16 +86,16 @@
  # Use absolute paths in these lines to avoid problems!				#
  #-------------------------------------------------------------------------------#
@@ -124,9 +122,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in
  
  #										#
  #################################################################################
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in	2005-08-24 23:58:18.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2dbs.conf.in	2006-08-16 23:36:58.000000000 -0400
+--- a/conf/d2dbs.conf.in
++++ b/conf/d2dbs.conf.in
 @@ -49,14 +49,14 @@
  # File and Path section								#
  # Use absolute paths in these lines to avoid problems!				#
@@ -151,9 +148,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.
  #										#
  #################################################################################
  
-diff -ruN pvpgn-1.8.0rc2.orig/src/Makefile.in pvpgn-1.8.0rc2/src/Makefile.in
---- pvpgn-1.8.0rc2.orig/src/Makefile.in	2005-07-29 02:11:38.000000000 +0600
-+++ pvpgn-1.8.0rc2/src/Makefile.in	2005-09-23 15:10:02.968342144 +0600
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -23,22 +23,23 @@
  bindir		= @bindir@
  sbindir		= @sbindir@
diff --git a/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch b/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch
new file mode 100644
index 000000000000..8cfa94610b55
--- /dev/null
+++ b/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch
@@ -0,0 +1,33 @@
+--- a/cmake/Modules/DefineInstallationPaths.cmake
++++ b/cmake/Modules/DefineInstallationPaths.cmake
+@@ -37,8 +37,8 @@
+   )
+ else()
+   SET(LOCALSTATE_INSTALL_DIR
+-    "${EXEC_INSTALL_PREFIX}/var/${APPLICATION_NAME}"
+-    CACHE PATH "The ${APPLICATION_NAME} local state install dir (default prefix/var)"
++    "/var/${APPLICATION_NAME}"
++    CACHE PATH "The ${APPLICATION_NAME} local state install dir (default /var)"
+     FORCE
+   )
+ endif()
+@@ -75,4 +75,4 @@
+     CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
+     FORCE
+   )
+-endif()
+\ No newline at end of file
++endif()
+--- a/cmake/Modules/DefineInstallationPaths.cmake
++++ b/cmake/Modules/DefineInstallationPaths.cmake
+@@ -71,8 +71,8 @@
+   )
+ else()
+   SET(SYSCONF_INSTALL_DIR
+-    "${EXEC_INSTALL_PREFIX}/etc/${APPLICATION_NAME}"
+-    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
++    "/etc/${APPLICATION_NAME}"
++    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default /etc)"
+     FORCE
+   )
+ endif()
diff --git a/games-server/pvpgn/metadata.xml b/games-server/pvpgn/metadata.xml
index a7406f387a17..c8348c402eb4 100644
--- a/games-server/pvpgn/metadata.xml
+++ b/games-server/pvpgn/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">pvpgn/pvpgn-server</remote-id>
 		<remote-id type="sourceforge">pvpgn.berlios</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-server/pvpgn/pvpgn-1.8.5-r2.ebuild b/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
index 67ba4ceed177..8d587fde8934 100644
--- a/games-server/pvpgn/pvpgn-1.8.5-r2.ebuild
+++ b/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch games
+EAPI=7
+
+inherit toolchain-funcs
 
 SUPPORTP="${PN}-support-1.3"
 DESCRIPTION="A gaming server for Battle.Net compatible clients"
@@ -15,19 +16,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql postgres"
 
-DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql[server] )"
-RDEPEND=${DEPEND}
+DEPEND="
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:*[server] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/pvpgn
+	acct-group/pvpgn
+"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fhs.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fhs.patch
+)
 
 src_configure() {
-	cd src
-	# everything in GAMES_BINDIR (bug #63071)
-	egamesconf \
-		--sbindir="${GAMES_BINDIR}" \
+	cd src || die
+
+	tc-export CC
+	# Was: "everything in GAMES_BINDIR (bug #63071)"
+	# Not anymore.
+	econf \
+		--sbindir="/usr/bin" \
 		$(use_with mysql) \
 		$(use_with postgres pgsql)
 }
@@ -45,43 +55,43 @@ src_install() {
 
 	emake -C src DESTDIR="${D}" install
 
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto /usr/share/${PN}
 	doins "${WORKDIR}/${SUPPORTP}/"*
 
-	# GAMES_USER_DED here instead of GAMES_USER (bug #65423)
+	# Was: "GAMES_USER_DED here instead of GAMES_USER (bug #65423)"
 	for f in bnetd d2cs d2dbs ; do
 		newinitd "${FILESDIR}/${PN}.rc" ${f}
+
 		sed -i \
 				-e "s:NAME:${f}:g" \
-				-e "s:GAMES_BINDIR:${GAMES_BINDIR}:g" \
-				-e "s:GAMES_USER:${GAMES_USER_DED}:g" \
-				-e "s:GAMES_GROUP:${GAMES_GROUP}:g" \
-				"${D}/etc/games/${PN}/${f}.conf" \
+				-e "s:GAMES_BINDIR:/usr/bin:g" \
+				-e "s:GAMES_USER:pvpgn:g" \
+				-e "s:GAMES_GROUP:pvpgn:g" \
+				"${D}/etc/${PN}/${f}.conf" \
 				"${D}/etc/init.d/${f}" || die
 	done
 
-	keepdir $(find "${D}${GAMES_STATEDIR}"/${PN} -type d -printf "${GAMES_STATEDIR}/${PN}/%P ") "${GAMES_STATEDIR}"/${PN}/log
-	prepgamesdirs
+	keepdir $(find "${ED}/var/lib"/${PN} -type d -printf "/var/lib/${PN}/%P ") /var/lib/${PN}/log
 
-	chown -R ${GAMES_USER_DED}:${GAMES_GROUP} "${D}${GAMES_STATEDIR}/${PN}"
-	fperms 0775 "${GAMES_STATEDIR}/${PN}/log"
-	fperms 0770 "${GAMES_STATEDIR}/${PN}"
+	chown -R pvpgn:pvpgn "${ED}/var/lib/${PN}" || die
+	fperms 0775 "/var/lib/${PN}/log"
+	fperms 0770 "/var/lib/${PN}"
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "If this is a first installation you need to configure the package by"
-	elog "editing the configuration files provided in ${GAMES_SYSCONFDIR}/${PN}"
+	elog "editing the configuration files provided in /etc/${PN}"
 	elog "Also you should read the documentation in /usr/share/docs/${PF}"
 	elog
 	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
 	elog "and update your configuration accordingly."
+
 	if use mysql ; then
 		elog
 		elog "You have enabled MySQL storage support. You will need to edit"
 		elog "bnetd.conf to use it. Read README.storage from the docs directory."
 	fi
+
 	if use postgres ; then
 		elog
 		elog "You have enabled PostgreSQL storage support. You will need to edit"
diff --git a/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild b/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild
new file mode 100644
index 000000000000..cb12d0eddd4a
--- /dev/null
+++ b/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+SUPPORTP="${PN}-support-1.3"
+DESCRIPTION="A gaming server for Battle.Net compatible clients"
+HOMEPAGE="https://pvpgn.pro"
+SRC_URI="https://github.com/pvpgn/pvpgn-server/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-server-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql odbc postgres sqlite"
+
+DEPEND="
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( dev-db/libiodbc )
+	postgres? ( dev-db/postgresql:*[server] )
+	sqlite? ( dev-db/sqlite )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/pvpgn
+	acct-group/pvpgn
+"
+
+PATCHES=(
+	#"${FILESDIR}"/${PN}-1.8.5-fhs.patch
+	"${FILESDIR}"/${PN}-1.99.7.2.1-path.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e 's/-O3 -march=native -mtune=native//' \
+		-e 's/-stdlib=libc++//' \
+		CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	tc-export CC
+
+	local mycmakeargs=(
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_ODBC=$(usex odbc)
+		-DWITH_PGSQL=$(usex postgres)
+		-DWITH_SQLITE3=$(usex sqlite)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local f
+
+	cmake_src_install
+
+	dolib.so "${BUILD_DIR}"/src/compat/libcompat.so
+	dolib.so "${BUILD_DIR}"/src/common/libcommon.so
+
+	# Was: "GAMES_USER_DED here instead of GAMES_USER (bug #65423)"
+	for f in bnetd d2cs d2dbs ; do
+		newinitd "${FILESDIR}/${PN}.rc" ${f}
+
+		sed -i \
+				-e "s:NAME:${f}:g" \
+				-e "s:GAMES_BINDIR:/usr/bin:g" \
+				-e "s:GAMES_USER:pvpgn:g" \
+				-e "s:GAMES_GROUP:pvpgn:g" \
+				"${ED}/etc/${PN}/${f}.conf" \
+				"${ED}/etc/init.d/${f}" || die
+	done
+
+	keepdir $(find "${ED}/var/lib"/${PN} -type d -printf "/var/lib/${PN}/%P ") /var/lib/${PN}/log
+
+	keepdir /var/pvpgn/{bnmail,chanlogs,charinfo,charsave,clans,ladders}
+	keepdir /var/pvpgn/{reports,status,teams,userlogs,users,userscdb}
+	keepdir /var/pvpgn/bak/char{info,save}
+
+	chown -R pvpgn:pvpgn "${ED}/var/lib/${PN}" || die
+	fperms 0775 "/var/lib/${PN}/log"
+	fperms 0770 "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	elog "If this is a first installation you need to configure the package by"
+	elog "editing the configuration files provided in /etc/${PN}"
+	elog "Also you should read the documentation in /usr/share/docs/${PF}"
+	elog
+	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
+	elog "and update your configuration accordingly."
+
+	if use mysql ; then
+		elog
+		elog "You have enabled MySQL storage support. You will need to edit"
+		elog "bnetd.conf to use it. Read README.storage from the docs directory."
+	fi
+
+	if use postgres ; then
+		elog
+		elog "You have enabled PostgreSQL storage support. You will need to edit"
+		elog "bnetd.conf to use it. Read README.storage from the docs directory."
+	fi
+}