games-fps/chocolate-doom: Version bump (and update accordingly SVN live ebuild)

svn path=/sunrise/; revision=6081

4 files changed, 21 insertions, 16 deletions

diff --git a/games-fps/chocolate-doom/ChangeLog b/games-fps/chocolate-doom/ChangeLog
index eb4e47a9f..c45ecdf88 100644
--- a/games-fps/chocolate-doom/ChangeLog
+++ b/games-fps/chocolate-doom/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Apr 2008; Davide Cendron (scen) <scen@gentoo.org>
+  -chocolate-doom-1.0.0.ebuild, +chocolate-doom-1.1.1.ebuild,
+  chocolate-doom-9999.ebuild:
+  Version bump (and update accordingly SVN live ebuild)
+
   07 Apr 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   chocolate-doom-1.0.0.ebuild, chocolate-doom-9999.ebuild:
   Fix quotation
diff --git a/games-fps/chocolate-doom/Manifest b/games-fps/chocolate-doom/Manifest
index d4f7428aa..b08a6c1e8 100644
--- a/games-fps/chocolate-doom/Manifest
+++ b/games-fps/chocolate-doom/Manifest
@@ -1,5 +1,5 @@
-DIST chocolate-doom-1.0.0.tar.gz 623180 RMD160 62da1878c80cc6d0ca03c87d98b7218c73346243 SHA1 d2739b6f096391beb468184f63387a6c2ec80eb1 SHA256 cb0eae5ade82b55891ec43161a252927c495246c7e62a02d7906cea10fa3b0d1
-EBUILD chocolate-doom-1.0.0.ebuild 1847 RMD160 723084ea2ab9d710b33d2539291e00fc2a8872a4 SHA1 4244c0947c542d0eafec9279f35b32a96cf23596 SHA256 80dd6647a067a911dc1bf27976bafd58b73499c0223478d5e931f64f1c16fb19
-EBUILD chocolate-doom-9999.ebuild 1922 RMD160 7c42b9c0c6120f7ba05b52f54c1ba27382065a46 SHA1 8069b21062f199fc62df67652a15bbf6f51f81ce SHA256 922ef609c49f525492c6c2dcbf491cfdf35ece286cbd03c33506118aedd100de
-MISC ChangeLog 824 RMD160 cc961214cbe5d792689a3402d7a6c88127ffc350 SHA1 eb387d401180c3fd2fee924d9dabcad0fac03ae7 SHA256 2d066cf7e4217c6635138fd5fee154d9c0506f186354ac9811da51ba6e486b8e
+DIST chocolate-doom-1.1.1.tar.gz 639599 RMD160 1ffffa0cdb4d7ab01c41121d8a938c74a48d85f5 SHA1 d5463c5095d2c10b057d7a6b46867796cb4a4df9 SHA256 0c2fe38a97b93dc8cec2707dc5150b9a46086711ec22729bd931956b6a0a24dc
+EBUILD chocolate-doom-1.1.1.ebuild 1874 RMD160 ded7ed69d72d9df95b2e4289c1e126573c91c697 SHA1 43b6d8f0311d00f8fc3ebfa8282500ff152b3c6a SHA256 6514caae749c2287258a2c77854991ef9e71939931e486de3bcf8564570b4825
+EBUILD chocolate-doom-9999.ebuild 1949 RMD160 83fe6203f97ebbc0cd05dd1405cf1c12e1e05c00 SHA1 9f6717d001cd2172206da0cf1489c1d2fbd5fadf SHA256 2641598f659f81da291d716d8b558e49db6ad20ff50454439d8ba7429c41266f
+MISC ChangeLog 1028 RMD160 c5a9dfe109ebeaa44bdb70f9cbb41158b64f8dcc SHA1 862f6f5ccb6ca82c91cc3b65daac66a733220978 SHA256 a4d8be0344846254d033ea582452e761f3d102a73cf2b4798072fe43d181ce59
 MISC metadata.xml 325 RMD160 165af415487e46f894ea96d95fc7a9893998918e SHA1 145f673f86b7460eff4e9703b6440e0da268dd4b SHA256 e186b93928e5f0d93cf9e3a8d9b542c0c570f7ae56cad7420299d9511720ed8d
diff --git a/games-fps/chocolate-doom/chocolate-doom-1.0.0.ebuild b/games-fps/chocolate-doom/chocolate-doom-1.1.1.ebuild
index 37a4a9ffb..d9018606b 100644
--- a/games-fps/chocolate-doom/chocolate-doom-1.0.0.ebuild
+++ b/games-fps/chocolate-doom/chocolate-doom-1.1.1.ebuild
@@ -44,18 +44,18 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin src/${PN} || die "dogamesbin ${PN} failed"
+	dogamesbin "src/${PN}" || die "dogamesbin ${PN} failed"
 	dogamesbin setup/chocolate-setup || die "dogamesbin chocolate-setup failed"
 	if use server ; then
 		dogamesbin src/chocolate-server || die "dogamesbin chocolate-server failed"
 	fi
 
-	doicon data/${PN}.png || die "doicon failed"
-	make_desktop_entry ${PN} "Chocolate Doom"
-	doicon data/chocolate-setup.png || die "doicon failed"
+	newicon data/doom.png "${PN}.png" || die "doicon failed"
+	make_desktop_entry "${PN}" "Chocolate Doom"
+	newicon data/setup.png chocolate-setup.png || die "doicon failed"
 	make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png
 
-	doman man/${PN}.6 || die "doman failed"
+	doman man/*.{5,6} || die "doman failed"
 	dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO || die "dodoc failed"
 
 	dodir "${GAMES_DATADIR}/doom-data" || die "dodir failed"
diff --git a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild
index f5a1abdf6..9fbb24ed0 100644
--- a/games-fps/chocolate-doom/chocolate-doom-9999.ebuild
+++ b/games-fps/chocolate-doom/chocolate-doom-9999.ebuild
@@ -11,7 +11,6 @@ ESVN_REPO_URI="https://chocolate-doom.svn.sourceforge.net/svnroot/chocolate-doom
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="server"
 
 DEPEND=">=media-libs/libsdl-1.1.3
@@ -35,6 +34,7 @@ src_unpack() {
 }
 
 src_compile() {
+
 	egamesconf \
 		--disable-sdltest \
 		--disable-dependency-tracking \
@@ -44,19 +44,19 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin src/${PN} || die "dogamesbin ${PN} failed"
+	dogamesbin "src/${PN}" || die "dogamesbin ${PN} failed"
 	dogamesbin setup/chocolate-setup || die "dogamesbin chocolate-setup failed"
 	if use server ; then
 		dogamesbin src/chocolate-server || die "dogamesbin chocolate-server failed"
 	fi
 
-	doicon data/${PN}.png || die "doicon failed"
-	make_desktop_entry ${PN} "Chocolate Doom"
-	doicon data/chocolate-setup.png || die "doicon failed"
+	newicon data/doom.png "${PN}.png" || die "doicon failed"
+	make_desktop_entry "${PN}" "Chocolate Doom"
+	newicon data/setup.png chocolate-setup.png || die "doicon failed"
 	make_desktop_entry chocolate-setup "Chocolate Doom Setup" chocolate-setup.png
 
-	doman man/${PN}.6 || die "doman failed"
-	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README TODO || die "dodoc failed"
+	doman man/*.{5,6} || die "doman failed"
+	dodoc AUTHORS BUGS CMDLINE ChangeLog NEWS README TODO || die "dodoc failed"
 
 	dodir "${GAMES_DATADIR}/doom-data" || die "dodir failed"