From 01fcd5027cfa8fdb26bdc0e4bed7c9a98921b3ad Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Tue, 13 Mar 2007 22:22:56 +0000 Subject: [PATCH] cleanup Package-Manager: portage-2.1.2.2 --- games-arcade/missile/Manifest | 22 +++-- .../files/1.0.1-Makefile-path-fix.patch | 80 ------------------- games-arcade/missile/missile-1.0.1.ebuild | 34 ++++---- 3 files changed, 28 insertions(+), 108 deletions(-) delete mode 100644 games-arcade/missile/files/1.0.1-Makefile-path-fix.patch diff --git a/games-arcade/missile/Manifest b/games-arcade/missile/Manifest index c6f264ee47c0..455c09a5162c 100644 --- a/games-arcade/missile/Manifest +++ b/games-arcade/missile/Manifest @@ -1,12 +1,11 @@ -AUX 1.0.1-Makefile-path-fix.patch 2730 RMD160 5849ee684ebab133c99bf4f8b34b0d093be3720c SHA1 f9132701e9119786cc250d7ba6654230d8fda34a SHA256 1b2587d772bf2811b871e545c4b29cedd7c0a008b6ef9c454784e37fa9d85678 -MD5 e35eefe94cc7a26de7e4c770d3156d4a files/1.0.1-Makefile-path-fix.patch 2730 -RMD160 5849ee684ebab133c99bf4f8b34b0d093be3720c files/1.0.1-Makefile-path-fix.patch 2730 -SHA256 1b2587d772bf2811b871e545c4b29cedd7c0a008b6ef9c454784e37fa9d85678 files/1.0.1-Makefile-path-fix.patch 2730 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST missile-1.0.1.tar.gz 214933 RMD160 021642753ab6385e91eda7310afc7b3e99006ff1 SHA1 afb22a4f472f71f36bbe89a761d3d1e7a5d335e6 SHA256 fd6d4c42ebc48ab305c4fd027b1b793aa1a8c71c7b61c8fc4040dc21c1ff7d3b -EBUILD missile-1.0.1.ebuild 1215 RMD160 501cc226441556717113dacc540312e02b4e0b7d SHA1 3744a9c1d754e3ce90cb12bcd76414fde86bdbb4 SHA256 13d3829db951f0deb11a31deb740a687633a1c4e7b8a8e1db23941b27696f31e -MD5 d74f74e21b6760c3a7cb408be690f703 missile-1.0.1.ebuild 1215 -RMD160 501cc226441556717113dacc540312e02b4e0b7d missile-1.0.1.ebuild 1215 -SHA256 13d3829db951f0deb11a31deb740a687633a1c4e7b8a8e1db23941b27696f31e missile-1.0.1.ebuild 1215 +EBUILD missile-1.0.1.ebuild 963 RMD160 fcca379100145869f3e73cad7d226da54c82b59e SHA1 22789db07749e51f380c88eae47b4ac70dd2ee2c SHA256 e7af880cc4c98ad80cc9efcf734cf783be04eb83bed8dbb2741db7a90290e225 +MD5 6aada5832a4fdb5fa55d63ae889f97ff missile-1.0.1.ebuild 963 +RMD160 fcca379100145869f3e73cad7d226da54c82b59e missile-1.0.1.ebuild 963 +SHA256 e7af880cc4c98ad80cc9efcf734cf783be04eb83bed8dbb2741db7a90290e225 missile-1.0.1.ebuild 963 MISC ChangeLog 1268 RMD160 bfbe130fc2148a437712d775b6ef12b2083b5427 SHA1 8bf1820ec2b5acd238c799044d814a7cc488d4e6 SHA256 5f2fbe66f0ba2b47b4f952039b24dfc4b4434e2a82c3901813c51f05530c8560 MD5 529da98dac2e8ebbdd5b2ae97ea739a9 ChangeLog 1268 RMD160 bfbe130fc2148a437712d775b6ef12b2083b5427 ChangeLog 1268 @@ -18,3 +17,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 25f497badd203ad0bf39fccf5a5e7af6 files/digest-missile-1.0.1 241 RMD160 51c2f959af31daf494b99dd2a3c2bddbd1df652c files/digest-missile-1.0.1 241 SHA256 754e3134a82e56b409e592c296f5c71c32a4b42270cc668749592268fe166fab files/digest-missile-1.0.1 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFF9yRHdz7hIScOURERAiizAJ0SZRfqf9Y8A/zP27MWYweji00DAwCgvJi2 +b124+u97bkCnTMno5YycJIU= +=PrYZ +-----END PGP SIGNATURE----- diff --git a/games-arcade/missile/files/1.0.1-Makefile-path-fix.patch b/games-arcade/missile/files/1.0.1-Makefile-path-fix.patch deleted file mode 100644 index 8482bd382d27..000000000000 --- a/games-arcade/missile/files/1.0.1-Makefile-path-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- Makefile.orig 2003-07-07 21:58:28.000000000 -0400 -+++ Makefile 2003-07-07 21:59:22.000000000 -0400 -@@ -19,14 +19,19 @@ - # INSTALLATION DIRS: - # binary will be installed to $game_prefix/$game_bin - # data to $game_prefix/$game_data --game_prefix = /usr/local --game_bin = bin --game_data = share/missile --game_icons = share/pixmaps -+game_prefix =GENTOO -+game_bin =GENTOO -+game_data =GENTOO -+game_icons =GENTOO -+DESTDIR = -+game_prefix:=$(DESTDIR)/$(game_prefix) -+game_bin:=$(DESTDIR)/$(game_bin) -+game_data:=$(DESTDIR)/$(game_data) -+game_icons:=$(DESTDIR)/$(game_icons) - - # who the owner of the installed game will be --install_as_owner = root --install_as_group = games -+install_as_owner =GENTOO -+install_as_group =GENTOO - - - -@@ -70,8 +75,9 @@ - # - #CC = ccmalloc gcc - CC = gcc --OPTS = $(RPM_OPT_FLAGS) -DDATA=\"$(game_prefix)/$(game_data)\" -DVERSION=\"$(DIST_VER)\" -D$(sound) --CFLAGS = -Wall -O2 $(OPTS) `sdl-config --cflags` -+MYOPTS = -+OPTS = $(RPM_OPT_FLAGS) -DDATA=\"$(game_data)\" -DVERSION=\"$(DIST_VER)\" -D$(sound) -+CFLAGS = -Wall -O2 $(OPTS) `sdl-config --cflags` $(MYOPTS) - #CFLAGS = -Wall -g `sdl-config --cflags` - LIBS = `sdl-config --libs` -lSDL_image $(SND_LIBS) - INCLUDE = -@@ -143,14 +149,14 @@ - install : - @$(STRIP) $(PROGRAM) || \ - (echo; echo "Please run \"make\" first to build the program"; echo; exit -1) -- $(INSTALL) $(IFLAGS) $(EXEC_PERM) $(PROGRAM) $(game_prefix)/$(game_bin)/$(PROGRAM) -+ $(INSTALL) $(IFLAGS) $(EXEC_PERM) $(PROGRAM) $(game_bin)/$(PROGRAM) - cd $(DATA);\ - for f in `find . -type f`; do \ -- $(INSTALL) $(IFLAGS) $(FILE_PERM) $$f $(game_prefix)/$(game_data)/$$f;\ -+ $(INSTALL) $(IFLAGS) $(FILE_PERM) $$f $(game_data)/$$f;\ - done - cd $(ICONS);\ - for f in `ls`; do \ -- $(INSTALL) $(IFLAGS) $(FILE_PERM) $$f $(game_prefix)/$(game_icons)/$$f;\ -+ $(INSTALL) $(IFLAGS) $(FILE_PERM) $$f $(game_icons)/$$f;\ - done - # $(MAKE) create_etc_conf - @echo "" -@@ -160,7 +166,7 @@ - - #create_etc_conf: - # if [ -w /etc ]; then \ --# echo "Data=$(game_prefix)/$(game_data)" > /etc/missilecommand.conf; \ -+# echo "Data=$(game_data)" > /etc/missilecommand.conf; \ - # fi - - # I need the right way to do this... -@@ -179,9 +185,9 @@ - - - uninstall : -- - rm $(game_prefix)/$(game_bin)/$(PROGRAM) -- - rm -rf $(game_prefix)/$(game_data) -- - rm $(game_prefix)/$(game_icons)/missile_icon_{black,blue,white,green,red,yellow}.png -+ - rm $(game_bin)/$(PROGRAM) -+ - rm -rf $(game_data) -+ - rm $(game_icons)/missile_icon_{black,blue,white,green,red,yellow}.png - @echo "" - @echo "---------------------------------------------------------------------" - @echo "$(PROGRAM) and associated files uninstalled." diff --git a/games-arcade/missile/missile-1.0.1.ebuild b/games-arcade/missile/missile-1.0.1.ebuild index cfa3eca76c2d..4366b1e319dd 100644 --- a/games-arcade/missile/missile-1.0.1.ebuild +++ b/games-arcade/missile/missile-1.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/missile/missile-1.0.1.ebuild,v 1.13 2006/12/06 17:04:44 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/missile/missile-1.0.1.ebuild,v 1.14 2007/03/13 22:22:56 nyhm Exp $ inherit eutils games @@ -13,32 +13,26 @@ SLOT="0" KEYWORDS="alpha amd64 ppc sparc x86" IUSE="" -RDEPEND=">=media-libs/libsdl-1.2.4 - >=media-libs/sdl-image-1.2.1 - >=media-libs/sdl-mixer-1.2.4 - media-libs/libpng" +DEPEND="media-libs/libsdl + media-libs/sdl-image + media-libs/sdl-mixer" src_unpack() { unpack ${A} - cd ${S} - epatch "${FILESDIR}/${PV}-Makefile-path-fix.patch" + cd "${S}" sed -i \ - -e "/^game_prefix/s:=GENTOO:=${GAMES_PREFIX}:" \ - -e "/^game_bin/s:=GENTOO:=${GAMES_PREFIX}/bin:" \ - -e "/^game_data/s:=GENTOO:=${GAMES_DATADIR}/${PN}:" \ - -e "/^game_icons/s:=GENTOO:=/usr/share/pixmaps/${PN}:" \ - -e "/^install_as_owner/s:=GENTOO:=${GAMES_USER}:" \ - -e "/^install_as_group/s:=GENTOO:=${GAMES_GROUP}:" \ + -e "s:\$(game_prefix)/\$(game_data):${GAMES_DATADIR}/${PN}:" \ + -e "s/-O2/${CFLAGS}/" \ Makefile \ - || die "sed failed" -} - -src_compile() { - emake MYOPTS="${CFLAGS}" || die "emake failed" + || die "sed failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + dogamesbin ${PN} || die "dogamesbin failed" + insinto "${GAMES_DATADIR}"/${PN} + doins -r data/* || die "doins failed" + newicon icons/${PN}_icon_black.png ${PN}.png + make_desktop_entry ${PN} "Missile Command" dodoc README prepgamesdirs } -- 2.26.2