make src_install static; tidy; clean older broken version (re: bug #73718)

5 files changed, 72 insertions, 61 deletions

diff --git a/games-rpg/openrpg/ChangeLog b/games-rpg/openrpg/ChangeLog
index a82e05c46b8d..edc6b65d3613 100644
--- a/games-rpg/openrpg/ChangeLog
+++ b/games-rpg/openrpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/openrpg
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/ChangeLog,v 1.7 2004/12/08 08:23:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/ChangeLog,v 1.8 2004/12/08 09:03:19 mr_bones_ Exp $
+
+*openrpg-1.6.1-r1 (08 Dec 2004)
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +openrpg-1.6.1-r1.ebuild, -openrpg-1.6.1.ebuild:
+  make src_install static; tidy; clean older broken version (re: bug #73718)
 
   08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> -openrpg-1.4.1.ebuild,
   -openrpg-1.5.1.ebuild:
diff --git a/games-rpg/openrpg/Manifest b/games-rpg/openrpg/Manifest
index f87ec263d624..a08c5359aeb0 100644
--- a/games-rpg/openrpg/Manifest
+++ b/games-rpg/openrpg/Manifest
@@ -1,7 +1,9 @@
 MD5 77b697c33ad261444590a12183f1dedf ChangeLog 893
+MD5 9bf240ff7eb51769fdb1b86dee3aa57b openrpg-1.6.1-r1.ebuild 1919
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 85e9bbad310e06a2f1e6c5646caa4864 openrpg-1.6.1.ebuild 1866
 MD5 a3a877a3127c4ac11108c1a5b92a12d0 files/1.5.1-gentoo-paths.patch 1156
+MD5 6fea28893d2bd6c8d845d04db2183d2c files/digest-openrpg-1.6.1-r1 65
 MD5 4ff4ff64e01f9f31bc34d647d07df279 files/openrpg 52
 MD5 4857bbf8a73aa2d8996a58b1622fefc4 files/openrpg-server 59
 MD5 a3a877a3127c4ac11108c1a5b92a12d0 files/1.6.1-gentoo-paths.patch 1156
diff --git a/games-rpg/openrpg/files/digest-openrpg-1.6.1 b/games-rpg/openrpg/files/digest-openrpg-1.6.1-r1
index c259d67b8fd9..c259d67b8fd9 100644
--- a/games-rpg/openrpg/files/digest-openrpg-1.6.1
+++ b/games-rpg/openrpg/files/digest-openrpg-1.6.1-r1
diff --git a/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild b/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..76207a0ffbf6
--- /dev/null
+++ b/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild,v 1.1 2004/12/08 09:03:19 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="Open RPG Client"
+HOMEPAGE="http://www.openrpg.com/"
+SRC_URI="mirror://sourceforge/openrpg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~amd64"
+IUSE=""
+
+DEPEND=">=dev-python/wxpython-2.4.0.2
+	>=dev-lang/python-2.2.2"
+
+S="${WORKDIR}/${PN}1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	edos2unix *.py
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
+	find -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
+	mkdir "${WORKDIR}/docs"
+	mv readme.txt "${WORKDIR}/docs"
+	rm license.txt
+	mkdir "${WORKDIR}/bins"
+	mv start.py "${WORKDIR}/bins/openrpg"
+	mv start_server.py "${WORKDIR}/bins/openrpg-server"
+	mv start_server_gui.py "${WORKDIR}/bins/openrpg-server-gui"
+	rm -f start.py start_server.py start_server_gui.py
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
+		"${WORKDIR}/bins/openrpg" \
+		"${WORKDIR}/bins/openrpg-server" \
+		"${WORKDIR}/bins/openrpg-server-gui" \
+		|| die "sed failed"
+	mv orpg/templates . || die "mv failed"
+}
+
+src_install() {
+	dogamesbin "${WORKDIR}/bins/"*
+	dodoc "${WORKDIR}/docs/"*
+
+	insinto "${GAMES_LIBDIR}/${PN}"
+	doins *.py || die "doins failed"
+	cp -r orpg "${D}/${GAMES_LIBDIR}/${PN}/" || die "cp failed"
+
+	dodir "${GAMES_DATADIR}/${PN}/orpg"
+	cp -r templates/ "${D}/${GAMES_DATADIR}/${PN}/orpg/" || die "cp failed"
+	cp -r data/ images/ "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
+	cp *.pyw "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed"
+
+	keepdir "${GAMES_DATADIR}/${PN}/myfiles"
+	prepgamesdirs
+	# i dont like this but the game needs to be rewritten more than
+	# i care to do myself to support ${HOME}/.openrpg
+	fperms g+w "${GAMES_DATADIR}/${PN}/myfiles"
+}
diff --git a/games-rpg/openrpg/openrpg-1.6.1.ebuild b/games-rpg/openrpg/openrpg-1.6.1.ebuild
deleted file mode 100644
index 04516d25709e..000000000000
--- a/games-rpg/openrpg/openrpg-1.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/openrpg-1.6.1.ebuild,v 1.6 2004/07/03 12:00:18 kloeri Exp $
-
-inherit games eutils
-
-DESCRIPTION="Open RPG Client"
-HOMEPAGE="http://www.openrpg.com/"
-SRC_URI="mirror://sourceforge/openrpg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
-
-DEPEND=">=dev-python/wxpython-2.4.0.2
-	>=dev-lang/python-2.2.2"
-
-S="${WORKDIR}/${PN}1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	edos2unix *.py
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	find -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
-}
-
-src_install() {
-	dodoc readme.txt
-	rm readme.txt license.txt
-
-	newgamesbin start.py openrpg
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/openrpg
-	dosed "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/openrpg
-	newgamesbin start_server.py openrpg-server
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/openrpg-server
-	dosed "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/openrpg-server
-	newgamesbin start_server_gui.py openrpg-server-gui
-	dosed "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/openrpg-server-gui
-	dosed "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" ${GAMES_BINDIR}/openrpg-server-gui
-	rm start.py start_server.py start_server_gui.py
-
-	insinto ${GAMES_LIBDIR}/${PN}
-	doins *.py
-	mv orpg/templates .
-	cp -r orpg ${D}/${GAMES_LIBDIR}/${PN}/
-	rm -rf orpg *.py
-
-	dodir ${GAMES_DATADIR}/${PN}
-	dodir ${GAMES_DATADIR}/${PN}/orpg
-	mv templates ${D}/${GAMES_DATADIR}/${PN}/orpg/
-	cp -r * ${D}/${GAMES_DATADIR}/${PN}
-
-	dodir ${GAMES_DATADIR}/${PN}/myfiles
-	prepgamesdirs
-	# i dont like this but the game needs to be rewritten more than
-	# i care to do myself to support ${HOME}/.openrpg
-	fperms g+w ${GAMES_DATADIR}/${PN}/myfiles
-}