version bump (bug #67335)

Package-Manager: portage-2.0.51.19

5 files changed, 315 insertions, 3 deletions

diff --git a/games-server/pvpgn/ChangeLog b/games-server/pvpgn/ChangeLog
index 3b487c3f9a1f..90028ed7a7c0 100644
--- a/games-server/pvpgn/ChangeLog
+++ b/games-server/pvpgn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-server/pvpgn
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/ChangeLog,v 1.4 2004/09/27 10:43:56 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/ChangeLog,v 1.5 2005/05/26 04:58:01 mr_bones_ Exp $
+
+*pvpgn-1.6.6 (26 May 2005)
+
+  26 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.6.6-fhs.patch, +pvpgn-1.6.6.ebuild:
+  version bump (bug #67335)
 
 *pvpgn-1.6.5-r1 (27 Sep 2004)
 
diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
index dec869eba3f3..cd22ee56887d 100644
--- a/games-server/pvpgn/Manifest
+++ b/games-server/pvpgn/Manifest
@@ -1,6 +1,9 @@
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 645c390657b1ff443b606c0f33ca0a55 pvpgn-1.6.5-r1.ebuild 2590
-MD5 6e2b75b24c441b52a2450d6e352904d0 ChangeLog 833
+MD5 4fa0c78783091db169bc9dbdb32e2583 pvpgn-1.6.6.ebuild 2585
+MD5 45584e1473e077ba867bf90307a8ce9c ChangeLog 992
+MD5 778be818c35e7df1e022398198427172 files/1.6.6-fhs.patch 10322
 MD5 0dea305044e123e1b1ee007331906727 files/init.d.rc 785
 MD5 778be818c35e7df1e022398198427172 files/1.6.5-fhs.patch 10322
+MD5 1c3287bfa7c9f6e8826885ab742acb79 files/digest-pvpgn-1.6.6 134
 MD5 ba5db7daf3b6cfeb5c463b3d8f7ee32b files/digest-pvpgn-1.6.5-r1 134
diff --git a/games-server/pvpgn/files/1.6.6-fhs.patch b/games-server/pvpgn/files/1.6.6-fhs.patch
new file mode 100644
index 000000000000..84be5abcd981
--- /dev/null
+++ b/games-server/pvpgn/files/1.6.6-fhs.patch
@@ -0,0 +1,211 @@
+diff -ur ../pvpgn-1.6.4/conf/bnetd.conf.in ./conf/bnetd.conf.in
+--- ../pvpgn-1.6.4/conf/bnetd.conf.in	2004-06-22 16:29:33.000000000 +0300
++++ ./conf/bnetd.conf.in	2004-08-27 11:12:19.789902272 +0300
+@@ -46,13 +46,13 @@
+ # - "pass" : db password                                                     #
+ #                                                                            #
+ # Examples:                                                                  #
+-# storage_path = file:dir=/usr/local/var/users;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.plain
+-# storage_path = cdb:dir=/usr/local/var/userscdb;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.cdb
++# storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain
++# storage_path = cdb:dir=%statedir%/userscdb;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.cdb
+ # storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0
+ # storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0
+ #----------------------------------------------------------------------------#
+ 
+-storage_path = file:dir=/usr/local/var/users;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.plain
++storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain
+ 
+ #                                                                            #
+ ##############################################################################
+@@ -63,36 +63,36 @@
+ # Use absolute paths in these lines to avoid problems!                       #
+ #----------------------------------------------------------------------------#
+ 
+-filedir     = /usr/local/var/files
+-reportdir   = /usr/local/var/reports
+-chanlogdir  = /usr/local/var/chanlogs
+-motdfile    = /usr/local/etc/bnmotd.txt
+-issuefile   = /usr/local/etc/bnissue.txt
+-channelfile = /usr/local/etc/channel.conf
+-newsfile    = /usr/local/etc/news.txt
+-adfile      = /usr/local/etc/ad.conf
+-topicfile   = /usr/local/etc/topics.conf
+-ipbanfile   = /usr/local/etc/bnban.conf
+-helpfile    = /usr/local/etc/bnhelp.conf
+-transfile   = /usr/local/etc/gametrans.conf
+-mpqfile     = /usr/local/etc/autoupdate.conf
+-logfile     = /usr/local/var/bnetd.log
+-realmfile   = /usr/local/etc/realm.conf
+-maildir     = /usr/local/var/bnmail
+-versioncheck_file = /usr/local/etc/versioncheck.conf
+-mapsfile    = /usr/local/etc/bnmaps.conf
+-xplevelfile = /usr/local/etc/bnxplevel.conf
+-xpcalcfile  = /usr/local/etc/bnxpcalc.conf
++filedir     = %datadir%
++reportdir   = %statedir%/reports
++chanlogdir  = %statedir%/chanlogs
++motdfile    = %confdir%/bnmotd.txt
++issuefile   = %confdir%/bnissue.txt
++channelfile = %confdir%/channel.conf
++newsfile    = %confdir%/news.txt
++adfile      = %confdir%/ad.conf
++topicfile   = %statedir%/etc/topics.conf
++ipbanfile   = %statedir%/etc/bnban.conf
++helpfile    = %confdir%/bnhelp.conf
++transfile   = %confdir%/gametrans.conf
++mpqfile     = %confdir%/autoupdate.conf
++logfile     = %logdir%/bnetd.log
++realmfile   = %confdir%/realm.conf
++maildir     = %statedir%/bnmail
++versioncheck_file = %confdir%/versioncheck.conf
++mapsfile    = %confdir%/bnmaps.conf
++xplevelfile = %confdir%/bnxplevel.conf
++xpcalcfile  = %confdir%/bnxpcalc.conf
+ #pidfile    = /usr/local/var/bnetd.pid
+-ladderdir   = /usr/local/var/ladders
+-command_groups_file = /usr/local/etc/command_groups.conf
+-tournament_file = /usr/local/etc/tournament.conf
+-statusdir   = /usr/local/var/status
+-aliasfile   = /usr/local/etc/bnalias.conf
+-w3trans_file = /usr/local/etc/w3trans.conf
+-anongame_infos_file = /usr/local/etc/anongame_infos.conf
+-DBlayoutfile = /usr/local/etc/sql_DB_layout.conf
+-supportfile = /usr/local/etc/supportfile.conf
++ladderdir   = %statedir%/ladders
++command_groups_file = %confdir%/command_groups.conf
++tournament_file = %confdir%/tournament.conf
++statusdir   = %statedir%/status
++aliasfile   = %confdir%/bnalias.conf
++w3trans_file = %confdir%/w3trans.conf
++anongame_infos_file = %confdir%/anongame_infos.conf
++DBlayoutfile = %confdir%/sql_DB_layout.conf
++supportfile = %confdir%/supportfile.conf
+ 
+ fortunecmd  = /usr/games/fortune
+ 
+diff -ur ../pvpgn-1.6.4/conf/d2cs.conf.in ./conf/d2cs.conf.in
+--- ../pvpgn-1.6.4/conf/d2cs.conf.in	2004-08-12 15:30:36.000000000 +0300
++++ ./conf/d2cs.conf.in	2004-08-26 14:11:11.000000000 +0300
+@@ -79,13 +79,13 @@
+ # Use absolute paths in these lines to avoid problems!				#
+ #-------------------------------------------------------------------------------#
+ #										#
+-logfile			=	/usr/local/var/d2cs.log
+-charsavedir		=	/usr/local/var/charsave
+-charinfodir		=	/usr/local/var/charinfo
+-ladderdir		=	/usr/local/var/ladders
+-newbiefile		=	/usr/local/var/files/newbie.save
+-d2gstransfile		=	/usr/local/etc/d2gstrans.conf
+-d2gsconffile		=	/usr/local/etc/d2server.ini
++logfile			=	%logdir%/d2cs.log
++charsavedir		=	%statedir%/charsave
++charinfodir		=	%statedir%/charinfo
++ladderdir		=	%statedir%/ladders
++newbiefile		=	%datadir%/files/newbie.save
++d2gstransfile		=	%confdir%/d2gstrans.conf
++d2gsconffile		=	%confdir%/d2server.ini
+ #										#
+ #################################################################################
+ 
+diff -ur ../pvpgn-1.6.4/conf/d2dbs.conf.in ./conf/d2dbs.conf.in
+--- ../pvpgn-1.6.4/conf/d2dbs.conf.in	2004-01-21 21:21:26.000000000 +0200
++++ ./conf/d2dbs.conf.in	2004-08-26 14:12:11.000000000 +0300
+@@ -47,13 +47,13 @@
+ # File and Path section								#
+ # Use absolute paths in these lines to avoid problems!				#
+ #-------------------------------------------------------------------------------#
+-logfile		=	/usr/local/var/d2dbs.log
+-logfile-gs	=	/usr/local/var/d2dbs-gs.log
+-charsavedir	=	/usr/local/var/charsave
+-charinfodir	=	/usr/local/var/charinfo
+-ladderdir	=	/usr/local/var/ladders
+-bak_charsavedir	=	/usr/local/var/bak/charsave
+-bak_charinfodir	=	/usr/local/var/bak/charinfo
++logfile		=	%logdir%/d2dbs.log
++logfile-gs	=	%logdir%/d2dbs-gs.log
++charsavedir	=	%statedir%/charsave
++charinfodir	=	%statedir%/charinfo
++ladderdir	=	%statedir%/ladders
++bak_charsavedir	=	%statedir%/bak/charsave
++bak_charinfodir	=	%statedir%/bak/charinfo
+ #										#
+ #################################################################################
+ 
+diff -ur ../pvpgn-1.6.4/src/Makefile.in ./src/Makefile.in
+--- ../pvpgn-1.6.4/src/Makefile.in	2004-06-23 00:39:31.000000000 +0300
++++ ./src/Makefile.in	2004-08-27 11:14:55.087293480 +0300
+@@ -23,21 +23,22 @@
+ bindir		= @bindir@
+ sbindir		= @sbindir@
+ mandir		= @mandir@
+-confdir		= @sysconfdir@
+-sharedir	= @localstatedir@
+-filesdir	= @localstatedir@/files
+-usersdir	= @localstatedir@/users
+-userscdbdir	= @localstatedir@/userscdb
+-clandir		= @localstatedir@/clans
+-bnmaildir	= @localstatedir@/bnmail
+-reportsdir	= @localstatedir@/reports
+-chanlogsdir	= @localstatedir@/chanlogs
+-charinfodir     = @localstatedir@/charinfo
+-charsavedir     = @localstatedir@/charsave
+-ladderdir       = @localstatedir@/ladders
+-statusdir       = @localstatedir@/status
+-bak_charsavedir = @localstatedir@/bak/charsave
+-bak_charinfodir = @localstatedir@/bak/charinfo
++confdir		= @sysconfdir@/pvpgn
++statedir	= @localstatedir@/pvpgn
++filesdir	= @datadir@/pvpgn
++usersdir	= @localstatedir@/pvpgn/users
++userscdbdir	= @localstatedir@/pvpgn/userscdb
++clandir		= @localstatedir@/pvpgn/clans
++bnmaildir	= @localstatedir@/pvpgn/bnmail
++reportsdir	= @localstatedir@/pvpgn/reports
++chanlogsdir	= @localstatedir@/pvpgn/chanlogs
++charinfodir     = @localstatedir@/pvpgn/charinfo
++charsavedir     = @localstatedir@/pvpgn/charsave
++ladderdir       = @localstatedir@/pvpgn/ladders
++statusdir       = @localstatedir@/pvpgn/status
++bak_charsavedir = @localstatedir@/pvpgn/bak/charsave
++bak_charinfodir = @localstatedir@/pvpgn/bak/charinfo
++logdir		= @localstatedir@/pvpgn/log
+ 
+ SRC_SRCDIR	= @srcdir@
+ SRC_BINDIR	= @srcdir@/../bin
+@@ -630,7 +631,7 @@
+ 
+ .PHONY: install-share
+ install-share:
+-	${INSTALL_DIRS} ${DESTDIR}/${sharedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
++	${INSTALL_DIRS} ${DESTDIR}/${datadir} ${DESTDIR}/${statedir} ${DESTDIR}/${statedir}/etc ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
+ 	${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \
+ 	${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} ${DESTDIR}/${clandir}
+ 	@list='${SHARES}'; for p in $$list; do \
+@@ -680,21 +681,21 @@
+ .PHONY: uninstall-share
+ uninstall-share:
+ 	@list='${SHARES}'; for p in $$list; do \
+-	  ${ECHO} "  ${RMF} ${sharedir}/$$p"; \
+-	  ${RMF} ${sharedir}/$$p; \
++	  ${ECHO} "  ${RMF} ${filesdir}/$$p"; \
++	  ${RMF} ${filesdir}/$$p; \
+ 	done
+ 
+ ${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status
+ 	@${RMF} $@
+-	${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/bnetd.conf.in > $@
++	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/bnetd.conf.in > $@
+ 
+ ${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status
+ 	@${RMF} $@
+-	${SED} -e "s@\(=[[:blank:]]*\"*\)/usr/local/var/@\1${sharedir}/@g" -e "s@\(=[[:blank:]]*\"*\)/usr/local/etc/@\1${confdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@
++	${SED} -e "s@\(=[[:blank:]]*\"*\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]*\"*\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@
+ 
+ ${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status
+ 	@${RMF} $@
+-	${SED} -e "s@\(=[[:blank:]]*\"*\)/usr/local/var/@\1${sharedir}/@g" -e "s@\(=[[:blank:]]*\"*\)/usr/local/etc/@\1${confdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@
++	${SED} -e "s@\(=[[:blank:]]*\"*\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]*\"*\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@
+ 
+ ${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o
+ 	@${RMF} $@
diff --git a/games-server/pvpgn/files/digest-pvpgn-1.6.6 b/games-server/pvpgn/files/digest-pvpgn-1.6.6
new file mode 100644
index 000000000000..27849eb1edc4
--- /dev/null
+++ b/games-server/pvpgn/files/digest-pvpgn-1.6.6
@@ -0,0 +1,2 @@
+MD5 f1405d0f6efb48ea408f6fe8a1f5e171 pvpgn-1.6.6.tar.bz2 1025551
+MD5 8ba36144ea3a7efe200536c142bb7886 pvpgn-support-1.0.tar.gz 126047
diff --git a/games-server/pvpgn/pvpgn-1.6.6.ebuild b/games-server/pvpgn/pvpgn-1.6.6.ebuild
new file mode 100644
index 000000000000..5d91f4e5480b
--- /dev/null
+++ b/games-server/pvpgn/pvpgn-1.6.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/pvpgn/pvpgn-1.6.6.ebuild,v 1.1 2005/05/26 04:58:01 mr_bones_ Exp $
+
+inherit eutils games
+
+SUPPORTP="pvpgn-support-1.0"
+DESCRIPTION="A gaming server for Battle.Net compatible clients"
+HOMEPAGE="http://www.pvpgn.org/"
+SRC_URI="http://pvpgn-files.ath.cx/releases/linux/1.6/${P}.tar.bz2
+	http://pvpgn-files.ath.cx/releases/linux/support.files/${SUPPORTP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="mysql postgres"
+
+DEPEND="sys-libs/zlib
+	mysql? ( >=dev-db/mysql-3.23 )
+	postgres? ( >=dev-db/postgresql-7 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-fhs.patch"
+}
+
+src_compile() {
+	cd src
+	# everything in GAMES_BINDIR (bug #63071)
+	egamesconf \
+		--sbindir="${GAMES_BINDIR}" \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	local f
+
+	dodoc README README.DEV CREDITS BUGS TODO UPDATE version-history.txt
+	docinto docs
+	dodoc docs/*
+
+	cd src
+	make DESTDIR="${D}" install || die "make install failed"
+
+	insinto "${GAMES_DATADIR}/pvpgn"
+	doins "${WORKDIR}/${SUPPORTP}/"* || die "doins failed"
+
+	# GAMES_USER_DED here instead of GAMES_USER (bug #65423)
+	for f in bnetd d2cs d2dbs ; do
+		newinitd "${FILESDIR}/init.d.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/init.d/${f}" \
+			|| die "sed failed"
+	done
+
+	prepgamesdirs
+	keepdir "${GAMES_STATEDIR}/pvpgn/log"
+	chown -R ${GAMES_USER_DED}:${GAMES_GROUP} "${D}${GAMES_STATEDIR}/pvpgn"
+	fperms 0755 "${GAMES_STATEDIR}/pvpgn/log"
+	fperms 0750 "${GAMES_STATEDIR}/pvpgn"
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	einfo "  If this is a first installation you have to configure package by"
+	einfo "editing the configuration files provided in \"${GAMES_SYSCONFDIR}/pvpgn\". Also you"
+	einfo "should read the documentation from /usr/share/docs/${PF}/"
+	einfo
+	einfo "  If you are upgrading you MUST read /usr/share/docs/${PF}/UPDATE.gz"
+	einfo "and update your configuration acordingly."
+	if use mysql ; then
+		echo
+		einfo "  You have enabled MySQL storage support. You will need to edit "
+		einfo "bnetd.conf to use it. Read README.storage from the docs dir."
+	fi
+	if use postgres ; then
+		echo
+		einfo "  You have enabled PostgreSQL storage support. You will need to edit "
+		einfo "bnetd.conf to use it. Read README.storage from the docs dir."
+	fi
+}