made ebuild more admin-friendly, include ad tool to distribution, and other minor (typo) fixes

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 51 insertions, 31 deletions

diff --git a/games-rpg/mangos/ChangeLog b/games-rpg/mangos/ChangeLog
index f81b2729852b..e8591d6410c6 100644
--- a/games-rpg/mangos/ChangeLog
+++ b/games-rpg/mangos/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/mangos
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/ChangeLog,v 1.2 2009/02/14 07:51:02 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/ChangeLog,v 1.3 2009/02/14 14:14:25 trapni Exp $
+
+  14 Feb 2009; Christian Parpart <trapni@gentoo.org>
+  files/9999/mangos-realmd, files/9999/mangos-worldd, mangos-9999.1.ebuild:
+  made ebuild more admin-friendly, include ad tool to distribution, and
+  other minor (typo) fixes
 
 *mangos-9999.1 (14 Feb 2009)
 
diff --git a/games-rpg/mangos/Manifest b/games-rpg/mangos/Manifest
index 1a88f8e3dc9e..926ae30ab388 100644
--- a/games-rpg/mangos/Manifest
+++ b/games-rpg/mangos/Manifest
@@ -1,6 +1,6 @@
-AUX 9999/mangos-realmd 712 RMD160 8f9d0d272943a6da1376d20c2bb1d36391743e69 SHA1 cb76996097c7f07b6112a74775c3f7af2bc72a7a SHA256 4b1bbbe59d70484ebd755239ae8ca470255d93e9c42c1a0ea1edae894c16f25a
-AUX 9999/mangos-worldd 668 RMD160 74d288b03e08d0adeebcb6c8fc04d1c85689b754 SHA1 3ff2537fcf83652508acba86f9b7ed9ee67011f4 SHA256 7b8426670786f6837cbfafef2d3559b407b5f7025eab70307c70cdf6136efd62
-EBUILD mangos-9999.1.ebuild 4112 RMD160 0c9c6e09407aa723d7f565a1f35a6f44a9574809 SHA1 18e9853f25e401875b85ca6ba0f64ae6e6dbe668 SHA256 8cedcffb15c7a676cce426a226cfc6a2d049b1fcf6291946013e49dfbe894a3c
+AUX 9999/mangos-realmd 702 RMD160 5fc54486086fa2b53310a46bba76de4d417b627d SHA1 da8611fb08806c98d0bff9d560dc4f25fc6c7fe6 SHA256 94f050a817370eb3a0cbcc6f53a6e872dc5aca7d793a74ec72a0cd52053497dd
+AUX 9999/mangos-worldd 673 RMD160 249725f499d4fb0b1c02810770603b50569677c3 SHA1 01c71c80e97fcb0896c5f662860a84d8e02bb707 SHA256 362fe8556d197114ed500ec54067a08b8b021cae67679d86075d2489474e6137
+EBUILD mangos-9999.1.ebuild 4665 RMD160 77936ad5851faf3992774a916d0601c340c56dc7 SHA1 1129eb04b292dfc06de087aa29a27b989f12053c SHA256 45df88821aafd28548b7fd8affa5747c8438ecbfd5c3564dd2d8240f609873ed
 EBUILD mangos-9999.ebuild 3380 RMD160 8adc78797f017f8dff4ebecc9273956d9483bd16 SHA1 d56c3c547fe6ecdd61e8671a4e929799c4d7241e SHA256 927e25b5dc7c374322f7e5cec557f5c1b41b92b59ae8d17b1e54541233393275
-MISC ChangeLog 572 RMD160 91417e9b822b53f4f65067d4956dedc3041b87bd SHA1 f83063d8282db96641c0290454492efaf8c1d855 SHA256 4927929b455e25146fe85b8789715f6e4da7369b5a4e0de77312ce14bc8bf8b1
+MISC ChangeLog 801 RMD160 52acf68a84a75a79a82b78104149851be1fa4283 SHA1 3f9c9dbb3e0865e5aac05becc9a46d09b15c3833 SHA256 5da9e342aefc528c0a01e3d99ed88571f17e22df4abfaded9ac118e43aa54916
 MISC metadata.xml 440 RMD160 2e77620a7a39f4a262407214d7b2dc3257c66793 SHA1 3ffff8c13dab3a413af8afe1f07b52b378d15c14 SHA256 3c844f9168d52e2281e8a197769d937640e3b87b58d3ead9d9723b0b78a33172
diff --git a/games-rpg/mangos/files/9999/mangos-realmd b/games-rpg/mangos/files/9999/mangos-realmd
index cb1dc11deffb..157a549b7749 100755
--- a/games-rpg/mangos/files/9999/mangos-realmd
+++ b/games-rpg/mangos/files/9999/mangos-realmd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/files/9999/mangos-realmd,v 1.1 2008/10/04 07:38:26 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/files/9999/mangos-realmd,v 1.2 2009/02/14 14:14:25 trapni Exp $
 
 depend() {
 	need net
@@ -10,14 +10,14 @@ depend() {
 
 start() {
 	ebegin "Starting MaNGOS Login Server (realmd)"
-	start-stop-daemon --start --background -c mangos --exec /usr/share/mangos/bin/mangos-realmd \
-		--make-pidfile --pidfile /var/run/mangos/realm.pid -- -c /etc/mangos/realmd.conf
+	start-stop-daemon --start --background -c mangos --exec /opt/mangos/bin/mangos-realmd \
+		--make-pidfile --pidfile /var/run/mangos-realmd.pid -- -c /opt/mangos/realmd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping MaNGOS Login Server (realmd)"
-	start-stop-daemon --stop -c mangos --exec /usr/share/mangos/bin/mangos-realmd \
-		--pidfile /var/run/mangos/realm.pid
+	start-stop-daemon --stop -c mangos --exec /opt/mangos/bin/mangos-realmd \
+		--pidfile /var/run/mangos-realmd.pid
 	eend $?
 }
diff --git a/games-rpg/mangos/files/9999/mangos-worldd b/games-rpg/mangos/files/9999/mangos-worldd
index d7e6143a7d96..accc0bcfb3f6 100755
--- a/games-rpg/mangos/files/9999/mangos-worldd
+++ b/games-rpg/mangos/files/9999/mangos-worldd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/files/9999/mangos-worldd,v 1.1 2008/10/04 07:38:26 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/files/9999/mangos-worldd,v 1.2 2009/02/14 14:14:25 trapni Exp $
 
 depend() {
 	need net
@@ -10,14 +10,14 @@ depend() {
 
 start() {
 	ebegin "Starting MaNGOS server"
-	start-stop-daemon --start --background -c mangos --pidfile /var/run/mangos/world.pid \
-		--make-pidfile --exec /usr/bin/mangos-worldd -- -c /etc/mangos/mangosd.conf
+	start-stop-daemon --start --background -c mangos --pidfile /var/run/mangos-world.pid \
+		--make-pidfile --exec /opt/mangos/bin/mangos-worldd -- -c /opt/mangos/etc/mangosd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping MaNGOS server"
-	start-stop-daemon --stop -c mangos --exec /usr/share/mangos/bin/mangos-worldd \
-		--pidfile /var/run/mangos/world.pid
+	start-stop-daemon --stop -c mangos --exec /opt/mangos/bin/mangos-worldd \
+		--pidfile /var/run/mangos-world.pid
 	eend $?
 }
diff --git a/games-rpg/mangos/mangos-9999.1.ebuild b/games-rpg/mangos/mangos-9999.1.ebuild
index 5c42c4c21463..003728855202 100644
--- a/games-rpg/mangos/mangos-9999.1.ebuild
+++ b/games-rpg/mangos/mangos-9999.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/mangos-9999.1.ebuild,v 1.1 2009/02/14 07:51:02 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mangos/mangos-9999.1.ebuild,v 1.2 2009/02/14 14:14:25 trapni Exp $
 
 # TODO:
 # - make use of system's zlib/zthread ebuilds instead of mangos' packaged
@@ -102,6 +102,10 @@ src_compile() {
 		|| die "econf failed"
 
 	emake || die "emake with current options failed"
+
+	cd "${S}/contrib/extractor" || die
+	cmake . || die
+	emake || die "failed to run emake for extractor"
 }
 
 src_install() {
@@ -111,28 +115,33 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	dodir "${PREFIX}/share"
+	mv "${D}/usr/share/mangos" "${D}${PREFIX}/share/mangos" || die
 	rm -f "${D}${PREFIX}/bin/genrevision" # not really part of mangos dist
 
 	doinitd "${FILESDIR}/${PV_FILES}/mangos-realmd" || die
 	doinitd "${FILESDIR}/${PV_FILES}/mangos-worldd" || die
 
-	dodir ${PREFIX}/share/mangos/dbc
-	dodir ${PREFIX}/share/mangos/maps
-	dodir ${PREFIX}/share/mangos/vmaps
+	exeinto "${PREFIX}/bin"
+	doexe "${S}/contrib/extractor/ad" || die
+
+	keepdir ${PREFIX}/share/mangos/dbc
+	keepdir ${PREFIX}/share/mangos/maps
+	keepdir ${PREFIX}/share/mangos/vmaps
 
 	if useq sd2; then
 		local DIRS=(sql sql/Updates sql/Updates/0.0.1 sql/Updates/0.0.2)
 
 		for dir in ${DIRS[*]}; do
-			dodir ${PREFIX}/share/sd2/${dir} || die
-			cp -r ../src/bindings/ScriptDev2/${dir}/*.sql ${D}${PREFIX}/share/sd2/${dir} || die
+			dodir "${PREFIX}/share/sd2/${dir}" || die
+			cp -r "../src/bindings/ScriptDev2/${dir}/*.sql" "${D}${PREFIX}/share/sd2/${dir}" || die
 		done
 	fi
 
-	dodir ${LOGDIR}
+	keepdir ${LOGDIR}
 
-	fowners root.mangos /etc/mangos
-	fowners mangos.mangos /var/log/mangos
+	fowners root.mangos ${SYSCONFDIR}
+	fowners mangos.mangos ${LOGDIR}
 }
 
 pkg_postinst() {
@@ -140,16 +149,22 @@ pkg_postinst() {
 
 	ewarn "You need to manually configure MaNGOS."
 	ewarn "See /etc/mangos/ for config files."
-	ewarn "Remember to move you maps, DBC and vmaps files to your data folder - ${PREFIX}/share/mangos/"
+	ewarn "Remember to move your maps, DBC and vmaps files to your data folder - ${PREFIX}/share/mangos/"
 	ewarn
 	ewarn "Don't forget to run SQL scripts for:"
-	ewarn "\t- MaNGOS databases : ${PREFIX}/share/mangos/sql"
-
-	useq sd2 && ewarn "\t- ScriptDev2 database: /usr/share/scriptdev2/sql"
+	ewarn "\t- MaNGOS databases: ${PREFIX}/share/mangos/sql"
+	useq sd2 && ewarn "\t- ScriptDev2 database: ${PREFIX}/share/sd2/sql"
 
 	ewarn
-	einfo "If you want Mangos to start automatically on boot execute :"
-	einfo "\t- rc-update add mangos-realmd default"
-	einfo "\t- rc-update add mangos-worldd default"
+	einfo "If you want Mangos to start automatically on boot execute:"
+	einfo "\trc-update add mangos-realmd default"
+	einfo "\trc-update add mangos-worldd default"
 	einfo
+
+	ewarn
+	einfo "Next steps for you may be as the following example:"
+	einfo "\t${PREFIX}/bin/ad -i/path/to/wow/client -o${PREFIX}/share/mangos"
+	# TODO replace these points with actual commands, and provide helpful URLs
+	einfo "\t- initialize database schema"
+	einfo "\t- populate database"
 }