gentoo resync : 16.04.2018

8 files changed, 595 insertions, 15 deletions

diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
index 081ceb1eec00..6ab9a96f6553 100644
--- a/games-arcade/amphetamine/Manifest
+++ b/games-arcade/amphetamine/Manifest
@@ -1,6 +1,11 @@
 AUX amphetamine-0.8.10-64bit.patch 2708 BLAKE2B 6abc82e1758000b1fbb3e930f51873026a9e6ab0c1558b2f793a9fad75d240b5c31fec6d69f7144a9c3a91eca809fca6860fdb72a1211b8aefd0d4d64480774a SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d
-AUX amphetamine-0.8.10-build.patch 696 BLAKE2B d2902d43619415686dc335ba2b58185ccdd62d4a24537f7efdee912359b60837f5f44b16b881203b7a08ebec423d92d32d18b3494da67c1e643582f5fba11b87 SHA512 cc7bfe701db5ca54a0437104217ffdad4cb0cc788b7b11db9eca3bbbfa8d2051ea3e76330046be53ec2b0f91d40d82187fd6fba3805993a724a3cf0be0ecf7d0
+AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e
+AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced
+AUX amphetamine-0.8.10-etc.patch 3838 BLAKE2B 0aa89ad89f0131db3fcb8c7935b2350cfa690d50d61b538fc29d859c8c8dd029b24ebc3036a214c7ce84ec83b2af137bc572e041a5f95fbfe578b7c264a6c234 SHA512 a1afaf30fdd86dfb518bb370b65c46ae4bf46b3acd4a81767f557b93b0a60983ac880b7082240c14c7b551263af116c4f26880ab7fe2bde5ca8f599e82ef1d2e
+AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523
+AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
+AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
 DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef
 DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1
-EBUILD amphetamine-0.8.10.ebuild 973 BLAKE2B 978e4860d2d464834cb251c1d9a44124453edc7c47194ffb9364cbbb00d95966b572d52ae14941540aa0079064d208d11fa433c17e5608d81c469b3ba0ecc7a0 SHA512 75f51f220bc86738786702f2448217d054a149fa7f3d0e264f20344792c07e2e1688eba49ba8e5a4d5e377ceee5901029d5423f129e3f8c8ac86c4142093ef32
+EBUILD amphetamine-0.8.10-r1.ebuild 1077 BLAKE2B de34c36beb4aa7d91013a545b4d27fc48b2cec791b45cc4109441aa2c6e0447f684e9420b9b6ef74beb2680abb3477bfa4bfcb6fe580909a7122e06ff3d3d10f SHA512 fb5958ad03a640ee0e2ffee5b6db758bd4694a99cd8638bd5e525bc7b254537506e47638e0e381566da6149491492ce633c8a857c7d17099cdc187908003cf12
 MISC metadata.xml 371 BLAKE2B 12bcfb84a083c0001e99fa3f002b259a5a448f895af66240422d951fc82e4d8635849b8604e588d977c99b47681bc9c3282217a81f107ba7a646fbdbc31f7bb1 SHA512 84d30e975d4eb430e73220b406c49c6d1015f0b449df73af8ff5aa4811a6634f5e90f2db52b28e4a39a1159cbdebc89d9dcb857821401a82156716ab94d5e8c5
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
index 4955b35b0d95..8df81545c760 100644
--- a/games-arcade/amphetamine/amphetamine-0.8.10.ebuild
+++ b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
 HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
@@ -18,23 +18,31 @@ DEPEND="media-libs/libsdl[sound,video]
 	x11-libs/libXpm"
 RDEPEND=${DEPEND}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-64bit.patch
+
+	# From Debian:
+	"${FILESDIR}"/${P}-no-lxt.patch
+	"${FILESDIR}"/${P}-bugs.patch
+	"${FILESDIR}"/${P}-missing-headers.patch
+	"${FILESDIR}"/${P}-newline.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-64bit.patch
+	default
 	sed -i -e '55d' src/ObjInfo.cpp || die
 }
 
 src_compile() {
-	emake INSTALL_DIR="${GAMES_DATADIR}"/${PN}
+	emake INSTALL_DIR=/usr/share/${PN}
 }
 
 src_install() {
-	newgamesbin amph ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	newbin amph ${PN}
+	insinto /usr/share/${PN}
 	doins -r ../amph/*
 	newicon amph.xpm ${PN}.xpm
 	make_desktop_entry ${PN} Amphetamine ${PN}
-	dodoc BUGS ChangeLog NEWS README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
new file mode 100644
index 000000000000..40a8345516c5
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
@@ -0,0 +1,56 @@
+description: fix issues in collision detection
+Index: amphetamine-0.8.10/src/Appl.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.cpp	2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/Appl.cpp	2006-05-15 19:17:02.000000000 +0200
+@@ -183,7 +183,7 @@
+ 
+ 	firstPlayRound = 1;
+ 	command = kCmdNoCommand;
+-	syncTime = gSystem->GetTicks();
++	syncTime = gSystem->GetTicks() - 20;
+ 	aveTime = 20;
+ 
+ 	while (command == kCmdNoCommand) {
+@@ -256,7 +256,7 @@
+ 
+ 		if (gSystem->KeyPressed(kKeyEscape)) {
+ 			command = gGUI->RunUserInterface(kMainPage);
+-			syncTime = gSystem->GetTicks();
++			syncTime = gSystem->GetTicks() - aveTime;
+ 		}
+ 		
+ 		if (command >= kSaveGameSlot0 && command <= kSaveGameSlot5) {
+Index: amphetamine-0.8.10/src/Object.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Object.cpp	2006-05-15 19:18:21.000000000 +0200
++++ amphetamine-0.8.10/src/Object.cpp	2006-05-15 19:18:33.000000000 +0200
+@@ -70,10 +70,13 @@
+ {
+ 	if (ABS(forcex) > ABS(forcey)) {
+ 		sx += SIGN(forcex);
+-		sy += forcey / ABS(forcex);
++		if (forcex != 0)
++			sy += forcey / ABS(forcex);
+ 	}else{
+ 		sy += SIGN(forcey);
+-		sx += forcex / ABS(forcey);
++		/* Avoid SIGFE on alpha on divide by zero. -- JEH */
++		if (forcey != 0)
++			sx += forcex / ABS(forcey);
+ 	}
+ }
+ 
+Index: amphetamine-0.8.10/src/Pltform.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Pltform.cpp	2006-05-15 19:18:25.000000000 +0200
++++ amphetamine-0.8.10/src/Pltform.cpp	2006-05-15 19:18:33.000000000 +0200
+@@ -136,7 +136,7 @@
+ 
+ short	CPlatform::Forces()
+ {
+-	short	collisionObject, collisionCode;
++	short	collisionObject = 0, collisionCode;
+ 	CObject	*collObj;
+ 
+ 	CObject::Forces();
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
index 2c0185f3ff01..185826c35c37 100644
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -26,8 +26,8 @@
  
  # makemake variables
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
new file mode 100644
index 000000000000..f4ad132dce64
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch
@@ -0,0 +1,126 @@
+description: use /etc/amphetamine for config files
+Index: amphetamine-0.8.10/src/ConstVal.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.cpp	2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/ConstVal.cpp	2006-05-15 19:17:02.000000000 +0200
+@@ -19,7 +19,7 @@
+ {
+ 	char	levelSetString[11] = "xxLevelSet";
+ 	char	levelBkgndString[13] = "xxLevelBkgnd";
+-	FILE	*paramFile = fopen(gSystem->QualifyDataDir(kParFileName), "r");  // by LL
++	FILE	*paramFile = fopen(gSystem->QualifyEtcDir(kParFileName), "r");  // by LL
+ 
+ 	gConst = new tConstValues;
+ 	
+@@ -159,7 +159,7 @@
+ 	fclose(paramFile);
+ 
+ 	// Hier sollte auch im Home Directory gesucht werden...
+-	paramFile = gSystem->FindFile(gConst->kFileConfig);   // by LL
++	paramFile = fopen(gSystem->QualifyEtcDir(gConst->kFileConfig), "r");  // by LL
+ 	
+ 	gConfigData->leftKey = GetLongConstant(paramFile, "LeftKey");
+ 	GetStringConstant(paramFile, "LeftKeyText", gConfigData->leftKeyText);
+@@ -212,6 +212,7 @@
+ 	char	c = 0;
+ 	short	n;
+ 
++	key[0] = '\0';
+ 	fseek(f, 0, SEEK_SET);
+ 
+ 	while (strcmp(key, constName)) {
+Index: amphetamine-0.8.10/src/Gui.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.cpp	2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/Gui.cpp	2006-05-15 19:17:02.000000000 +0200
+@@ -688,7 +688,7 @@
+ 
+ void	CGUI::LoadMessages()
+ {
+-	FILE	*f = fopen(gSystem->QualifyDataDir(kParFileName), "r");   // by LL
++	FILE	*f = fopen(gSystem->QualifyEtcDir(kParFileName), "r");   // by LL
+ 	char	msgString[6] = "msgxx";
+ 	short	n;
+ 
+@@ -724,7 +724,7 @@
+ 
+ void	LoadGUIParameters()
+ {
+-	FILE	*f = fopen(gSystem->QualifyDataDir(kParFileName), "r");  // by LL
++	FILE	*f = fopen(gSystem->QualifyEtcDir(kParFileName), "r");  // by LL
+ 
+ 	gGUIConst = new tGUIConstants;
+ 
+Index: amphetamine-0.8.10/src/System.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.cpp	2006-05-15 19:16:56.000000000 +0200
++++ amphetamine-0.8.10/src/System.cpp	2006-05-15 19:17:02.000000000 +0200
+@@ -143,6 +143,14 @@
+ 	return tmp;

+ }

+ 

++char *CSystem::QualifyEtcDir(const char *fname)

++{

++  	char *tmp = new char[strlen(etcDir)+strlen(fname)+2];

++  	sprintf(tmp, "%s/%s", etcDir, fname);

++  

++  	return tmp;

++}

++

+ void CSystem::GetHomeDir()

+ {

+ 	char *tmp;

+@@ -169,7 +177,9 @@
+ 	GetHomeDir();

+ 	dataDir = new char[strlen(INSTALL_DIR)+1];

+ 	strcpy(dataDir, INSTALL_DIR);

+-	

++	etcDir = new char[strlen(ETC_DIR)+1];	

++  	strcpy(etcDir, ETC_DIR);

++  

+ 	char	*logFileName = QualifyHomeDir(kLogFileName);

+ 

+ 	logFile = fopen(logFileName, "w");  // by LL

+@@ -180,6 +190,8 @@
+     if ( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {

+        MSG("SDL_Init_Failed.");

+        MSG(SDL_GetError());

++       /* Ouput to stdout too. */

++       printf("SDL_Init_Failed: %s\n", SDL_GetError());

+  

+        exit(1);

+     }

+Index: amphetamine-0.8.10/src/System.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.hpp	2006-05-15 19:16:57.000000000 +0200
++++ amphetamine-0.8.10/src/System.hpp	2006-05-15 19:17:02.000000000 +0200
+@@ -16,6 +16,10 @@
+ #define INSTALL_DIR  "/usr/local/games/amph"
+ #endif
+ 
++#ifndef ETC_DIR
++#define ETC_DIR "/etc/amphetamine"
++#endif
++
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+ #undef __BIG_ENDIAN__
+ #else
+@@ -76,6 +80,7 @@
+ 	RGBcolor	*palColors;
+ 	char		*homeDir;
+ 	char		*dataDir;
++  	char		*etcDir;
+ 	int			workingSound;
+ 
+ //"""""""""""""""" System Stuff
+@@ -107,8 +112,10 @@
+ 	void	GetHomeDir();
+ 	char	*QualifyDataDir(const char *fname);
+ 	char	*QualifyHomeDir(const char *fname);
++  	char	*QualifyEtcDir(const char *fname);
+ 	void 	ScreenShot();
+ 	FILE 	*FindFile(const char *fname);
+ };
+ 
+ #endif
++
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
new file mode 100644
index 000000000000..f9c1b9932b11
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
@@ -0,0 +1,13 @@
+description: include string.h
+Index: amphetamine-0.8.10/src/Surface.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Surface.cpp	2006-05-15 19:10:49.000000000 +0200
++++ amphetamine-0.8.10/src/Surface.cpp	2006-05-15 19:11:01.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include "ShapeLd.hpp"
+ #include "Clut.hpp"
+ #include "ConstVal.hpp"
++#include <string.h>
+ #include <memory.h>
+ 
+ const	short	kNoCharSpace = 20;
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
new file mode 100644
index 000000000000..36482ef30fb1
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
@@ -0,0 +1,358 @@
+description: fix newlines
+Index: amphetamine-0.8.10/src/AmpHead.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/AmpHead.hpp	2002-03-25 11:38:15.000000000 +0100
++++ amphetamine-0.8.10/src/AmpHead.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -185,4 +185,4 @@
+ 
+ #define MSG(message) if (logFile) fprintf(logFile, message); fflush(logFile)
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Appl.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.cpp	2002-03-25 12:47:49.000000000 +0100
++++ amphetamine-0.8.10/src/Appl.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -404,4 +404,4 @@
+ 	if (preRenderQueue == remove) bulletList = bulletList->nextBullet;
+ 	if (remove->nextBullet) remove->nextBullet->prevBullet = remove->prevBullet;
+ 	if (remove->prevBullet) remove->prevBullet->nextBullet = remove->nextBullet;
+-}*/
+\ No newline at end of file
++}*/
+Index: amphetamine-0.8.10/src/Appl.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Appl.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Appl.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -102,4 +102,4 @@
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Clut.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Clut.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Clut.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+ 
+ void	SwapBlackWhite(Graphic_file *gf);
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ConstVal.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ConstVal.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -271,4 +271,5 @@
+ void	GetStringConstant(FILE *f, char *constName, char *buffer)
+ {
+ 	GetValue(f, constName, buffer);
+-}
+\ No newline at end of file
++}
++
+Index: amphetamine-0.8.10/src/ConstVal.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ConstVal.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ConstVal.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -160,4 +160,4 @@
+ 	short	disableShapeModes;
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Creeper.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Creeper.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Creeper.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -4,4 +4,4 @@
+ #include "Monster.hpp"
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Element.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Element.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Element.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -373,4 +373,4 @@
+ 	CElement::Read(f);
+ 
+ 	OnAllocate();
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/File.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/File.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/File.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -26,4 +26,4 @@
+ long	CFile::ReadData(void *data, long size)
+ {
+ 	return fread(data, size, 1, fileRef);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Graphfil.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Graphfil.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Graphfil.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -54,4 +54,4 @@
+ Graphic_file *LoadGIF(FILE *fp, char *fname );
+ Graphic_file *LoadPICTR(FILE *fp, char *fname );
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Gui.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Gui.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -796,4 +796,5 @@
+ 	fclose(f);
+ }
+ 
+-	
+\ No newline at end of file
++	
++
+Index: amphetamine-0.8.10/src/Gui.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Gui.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Gui.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -183,4 +183,4 @@
+ 	void	DisplayInfotext(short num);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Item.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Item.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Item.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -309,4 +309,4 @@
+ 
+ 	READDATA(pickedUp);
+ 	READDATA(type);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Item.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Item.hpp	2002-03-24 11:10:24.000000000 +0100
++++ amphetamine-0.8.10/src/Item.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+ 	void	Read(FILE *f);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Level.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Level.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Level.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -29,4 +29,4 @@
+ };
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Main.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Main.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Main.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -84,4 +84,4 @@
+ 	delete gApplication;
+ 
+ 	return 0;
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Monster.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monster.cpp	2002-03-25 11:53:27.000000000 +0100
++++ amphetamine-0.8.10/src/Monster.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -372,4 +372,4 @@
+ 	READDATA(health);
+ 
+ 	if (dieFrame != -1) gApplication->Dequeue(&gApplication->collisionThingList, this);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Monster.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monster.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Monster.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -86,4 +86,4 @@
+ 
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Monstrxx.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Monstrxx.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Monstrxx.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -123,4 +123,4 @@
+ 	void	Read(FILE *f);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ObjInfo.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ObjInfo.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ObjInfo.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -97,4 +97,4 @@
+ 	tWeaponInfo	*FindWeapon(short ref);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Player.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Player.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Player.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -527,4 +527,4 @@
+ 
+ 	READDATA(oxygen);
+ 	READDATA(lastOxygenDecTime);
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Player.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Player.hpp	2002-03-24 11:10:24.000000000 +0100
++++ amphetamine-0.8.10/src/Player.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -81,4 +81,4 @@
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Pltform.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Pltform.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Pltform.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -276,4 +276,4 @@
+ 	fread(info, sizeof(tPlatformInfo), 1, f);
+ 
+ 	OnAllocate();
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/ShapeDes.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ShapeDes.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ShapeDes.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -376,4 +376,4 @@
+ };
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/ShapeLd.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/ShapeLd.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/ShapeLd.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -93,4 +93,4 @@
+ 	height = backgroundPicture->height;
+ 
+ 	return backgroundPicture->bitmap;
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/SndSys.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SndSys.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SndSys.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -132,4 +132,5 @@
+         		playList->RemoveCurrent();
+         	}
+         }
+-}
+\ No newline at end of file
++}
++
+Index: amphetamine-0.8.10/src/SndSys.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SndSys.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SndSys.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -99,4 +99,5 @@
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
++
+Index: amphetamine-0.8.10/src/SoundList.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/SoundList.hpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/SoundList.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -55,4 +55,4 @@
+ 	SoundState *first, *prev, *current;

+ };

+ 

+-#endif 
+\ No newline at end of file
++#endif

+Index: amphetamine-0.8.10/src/System.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/System.cpp	2002-03-25 10:31:27.000000000 +0100
++++ amphetamine-0.8.10/src/System.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -554,4 +554,5 @@
+ 		delete [] tmp;

+ 		

+ 	return NULL;  // failed

+-}
+\ No newline at end of file
++}

++

+Index: amphetamine-0.8.10/src/Thing.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Thing.hpp	2002-03-24 17:16:00.000000000 +0100
++++ amphetamine-0.8.10/src/Thing.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -64,4 +64,4 @@
+ 
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+Index: amphetamine-0.8.10/src/Weapon.cpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Weapon.cpp	2002-03-24 09:49:09.000000000 +0100
++++ amphetamine-0.8.10/src/Weapon.cpp	2006-05-15 19:08:52.000000000 +0200
+@@ -467,4 +467,4 @@
+ 	READDATA(dx);
+ 	READDATA(dy);
+ 
+-}
+\ No newline at end of file
++}
+Index: amphetamine-0.8.10/src/Weapon.hpp
+===================================================================
+--- amphetamine-0.8.10.orig/src/Weapon.hpp	2002-03-24 17:16:14.000000000 +0100
++++ amphetamine-0.8.10/src/Weapon.hpp	2006-05-15 19:08:52.000000000 +0200
+@@ -152,4 +152,4 @@
+ 	short	Shoot(double directionx, double directiony, double targetpos);
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
new file mode 100644
index 000000000000..1e654dc89203
--- /dev/null
+++ b/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
@@ -0,0 +1,14 @@
+description: don't link against Xt
+Index: amphetamine-0.8.10/Makefile
+===================================================================
+--- amphetamine-0.8.10.orig/Makefile	2006-11-08 11:05:57.000000000 +0100
++++ amphetamine-0.8.10/Makefile	2006-11-08 11:06:01.000000000 +0100
+@@ -69,7 +69,7 @@
+ LOADLIBES := -lm $(SDL_LIBS)
+ 
+ ifeq ($(USE_LIB_XPM),TRUE)
+-    LOADLIBES := $(LOADLIBES) -lXpm -lXt
++    LOADLIBES := $(LOADLIBES) -lXpm
+ endif
+ 
+ LDFLAGS   = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib