version bump with patch update by Michael (kensington) (bug #394277)

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 113 insertions, 22 deletions

diff --git a/games-strategy/lightyears/ChangeLog b/games-strategy/lightyears/ChangeLog
index 27c6d10cdf00..be113c68b86b 100644
--- a/games-strategy/lightyears/ChangeLog
+++ b/games-strategy/lightyears/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/lightyears
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.13 2011/04/25 20:36:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/ChangeLog,v 1.14 2011/12/13 03:02:52 mr_bones_ Exp $
+
+*lightyears-1.4 (13 Dec 2011)
+
+  13 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org> +lightyears-1.4.ebuild,
+  +files/lightyears-1.4-gentoo.patch:
+  version bump with patch update by Michael (kensington) (bug #394277)
 
   25 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   lightyears-1.3a.ebuild:
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index f89b382447ec..398d2fc2fc00 100644
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,25 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lightyears-1.3a-gentoo.patch 968 RMD160 fd5792d117ecfeced59ee9d19a1e2d71396010d5 SHA1 481ec09e1a1ff858e90f9c745c94da39bf9dae0c SHA256 7ea3224c82a4ad1b877e91c896d976f29968f823f2dfd140107de84c746a985c
+AUX lightyears-1.4-gentoo.patch 1276 RMD160 ecafbc55504618f0656a2b1aeebbfcbb67849c96 SHA1 d50b23517952955cc5a7a184bd541dd10e02862e SHA256 7cf2e3be95ac2e7ff725dcc298d8d2fa5af835e46f80320d0b0a85a62f443898
 DIST lightyears-1.3a.tar.gz 680843 RMD160 0a5dd05fe29002fe0a5d913cf6052611d54c32f7 SHA1 9ba3c48ce36d39c0d2bb44c7919f6fd301944ec2 SHA256 dd898452ce791321039bf895b50a77dab360c3866c98e3a80955fce71e637be0
+DIST lightyears-1.4.tar.bz2 693877 RMD160 d7b09e758891e9c239082e61977aa28ea97cb0db SHA1 90a365c5c14a696edbf5fc12fafa535ce8244380 SHA256 add4a8dea58af1e1ba69db3c0b1271312107c18e84b91a9dbb7162e92a1b078e
 EBUILD lightyears-1.3a.ebuild 1336 RMD160 098b56e2ee3a88f209daf12ed9a45264a3bd6d92 SHA1 c74e7355a5c164a76eb1ed9175066b5c99561e87 SHA256 12950667e9531fdc16edac93eff05b161cbdcd3de84739ab2f46f5dcfd4e163d
-MISC ChangeLog 1896 RMD160 188b6c1ce1cc8fceace3fc3ab691b2acf827de13 SHA1 0d42c5d9b652e506aa142b270e842bab2276585d SHA256 522a76574cc651b46bb99205980741d806828bdf5b204e8d88548fe1f332c254
+EBUILD lightyears-1.4.ebuild 1361 RMD160 c1885f3764e658794feec28e90ba22ca6e6cec36 SHA1 0b0d7cc6986471ee9a730f70e83de841300c8130 SHA256 0f8489e187ded4fad794067fb9830516ae8761dd5c5266521662ff3e962c0b4d
+MISC ChangeLog 2117 RMD160 3568e11b8e9882cd876d41cf464e4d62df0b9996 SHA1 2cf6a4252f6772d3bd119466e985a18886d4c36e SHA256 daceb4498773c944f2b1d52e36c3ca65f1a4cb94e19292e9df9fd67a96defb29
 MISC metadata.xml 366 RMD160 5d947375304d60e93c580163a09d6c27dea33a98 SHA1 a4b1a9849dfc45aaca4fb7cac65e695cf4277cd7 SHA256 c21e8e6d236aef6628b448f839689a39ea28201b15ff08fffb1aadd717f7f6b7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNtdtkAAoJENgZr6v6gHY0N7QQALUesvxpOQNxVZU6cIodSW0R
-mKj7/qhTfvl0zbqNQoz0sal9Zg9wXCfOotXuMiQoeBLDqB9Ux82qgesnb4pUyQ1J
-sjq3YgggKB/iTkzz7Bp9g1b55xGZVT/9gCTEKMKplx3KNlviepR+mNmi814SrJXU
-5Akbb7pv6fw77mi/tUusukVJ1Qp2/djQM7CCHn3l+X/HiBxcoUFcEmYETqgzhhCJ
-i0blbeks6jSEfv4Mpb+36CDpSjpJJo6ixsgBVSzyMLqwCAHOKg/zuNO1YnhBG2RA
-xiUBqTqcKfFX0VAyNX2iDLZg0tuu0qmQFzql29aj8EnWCdC8IjfNYNlLrgQQlWFk
-ewxs+nmilQFESda1SNEZ+QsRCpp5odgBBKIRXyhqAORKBT7C3e3kQ1X5k4Rg+jIh
-6cN9ISGLkXEAkUJlSelLTPMiMqVuEFKagRvbdRS+To1uIQtzkd0r6qNvai4ueVZV
-SLVy0Y84knQij8wc2gMrMkOsq/p0KAZtrpehVETvG96Bn5Vnse3bpGSAOjGpFhND
-7RdwrkDR52W242FZNK9UVTj09DhstNwlwXN6ukHxFaCtd5I24dZ1ichAJC89fmM7
-/Py9vBV8WNl3bmbaTYZ0huLLBS6ilseVhSjbA116FNp0HKDeDcZB58sNH+o0FZF5
-wvd3duhpKtXWKsmjYJRY
-=BbBr
------END PGP SIGNATURE-----
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
new file mode 100644
index 000000000000..063dbab3c1e8
--- /dev/null
+++ b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
@@ -0,0 +1,45 @@
+--- lightyears
++++ lightyears
+@@ -1,7 +1,6 @@
+ #!/usr/bin/python
+ 
+ # Set the location of the LightYears files here:
+-LIGHTYEARS_DIR = "."
+ # LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
+ 
+ # Save games and configuration files are stored in the user's
+@@ -10,31 +9,6 @@
+ import sys, os
+ 
+ if __name__ == "__main__":
+-    # Path to data/code dir can be overridden by environment variable
+-    LIGHTYEARS_DIR = os.environ.get("LIGHTYEARS_DIR", LIGHTYEARS_DIR)
+-
+-    # Path does not exist? Try current directory.
+-    if ((LIGHTYEARS_DIR == None)
+-    or (not os.path.isdir(LIGHTYEARS_DIR))
+-    or (not os.path.isfile(os.path.join(LIGHTYEARS_DIR, 
+-                            'code', 'startup.py')))):
+-        LIGHTYEARS_DIR = os.getcwd()
+-
+-    # Paths obtained
+-    sys.path.insert(0, os.path.join(LIGHTYEARS_DIR, 'code'))
+-    data_dir = os.path.join(LIGHTYEARS_DIR, 'data')
+-
+-    # Go
+-    try:
+-        import startup
+-        assert os.path.isdir(data_dir)
+-    except:
+-        print "Unable to find LightYears code & data in:"
+-        for p in sys.path:
+-            print '  ', p
+-
+-        sys.exit(1)
+-
+-    startup.Main(data_dir)
+-    
+-
++    sys.path.insert(0, "@GENTOO_LIBDIR@")
++    import startup
++    startup.Main("@GENTOO_DATADIR@/data")
diff --git a/games-strategy/lightyears/lightyears-1.4.ebuild b/games-strategy/lightyears/lightyears-1.4.ebuild
new file mode 100644
index 000000000000..8df1cdb0f893
--- /dev/null
+++ b/games-strategy/lightyears/lightyears-1.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lightyears/lightyears-1.4.ebuild,v 1.1 2011/12/13 03:02:52 mr_bones_ Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils python games
+
+DESCRIPTION="a single-player game with a science-fiction theme"
+HOMEPAGE="http://www.jwhitham.org.uk/20kly/"
+SRC_URI="http://www.jwhitham.org.uk/20kly/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygame"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}"-gentoo.patch
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:$(games_get_libdir)/${PN}:" \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		${PN} || die "Changing library path failed"
+	python_convert_shebangs -r 2 .
+}
+
+src_install() {
+	dogamesbin ${PN} || die "dogamesbin failed"
+
+	insinto "$(games_get_libdir)/${PN}"
+	doins code/*.py || die "doins code failed"
+
+	dodoc README.txt
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r audio data manual || die "doins data failed"
+
+	newicon data/32.png ${PN}.png
+	make_desktop_entry ${PN} "Light Years Into Space"
+	prepgamesdirs
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+pkg_postinst() {
+	python_mod_optimize "$(games_get_libdir)/${PN}"
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup "$(games_get_libdir)/${PN}"
+}