Fix locale issue and add RESTRICT=test, bug #144100

Package-Manager: portage-2.1.2_rc1-r4

4 files changed, 18 insertions, 155 deletions

diff --git a/games-strategy/ufo2000/Manifest b/games-strategy/ufo2000/Manifest
index fdac488b9b8b..8181e18a85af 100644
--- a/games-strategy/ufo2000/Manifest
+++ b/games-strategy/ufo2000/Manifest
@@ -1,31 +1,27 @@
-AUX ufo2000-0.6.627-gcc41.patch 775 RMD160 8535fd899d30bd84528ca36a18f0027f9124c55c SHA1 bf4d89face1f187d2769ba8194601202eff8d052 SHA256 7e5e47d715072e1ac6f0c8fe2bfe6649a68e339e11e43a685f4943b692dc13d3
-MD5 28d808507493899f932f191e7400caa5 files/ufo2000-0.6.627-gcc41.patch 775
-RMD160 8535fd899d30bd84528ca36a18f0027f9124c55c files/ufo2000-0.6.627-gcc41.patch 775
-SHA256 7e5e47d715072e1ac6f0c8fe2bfe6649a68e339e11e43a685f4943b692dc13d3 files/ufo2000-0.6.627-gcc41.patch 775
-DIST terror.zip 1096279 RMD160 eeed8764d8cc26ddf4c57179f17d7eabaf85ec72 SHA1 2b5ee654fac40769ff452d8166cd33231bef733c SHA256 9af0930f6aade6cc02355c3d0354e9ccca4989f22636a013b3c34b2e55336cc8
-DIST ufo2000-0.6.627-src.tar.bz2 795646 RMD160 fbe561bcfeb85f63869f030d46bc40ebb274ae6f SHA1 8887d16c0aeef8ccaab86e7d91d892ebdb416266 SHA256 c34ae7525d222e506f77ec8de4ea34704a5b4a1f785433e245ec6b5683f00eaa
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ufo2000-0.7.1062-src.tar.bz2 1995587 RMD160 a165698bbbf6d856cde9c1546c3a699e998310cd SHA1 e6d0aeb4f46ee928e687a64e7c3fec8796517d54 SHA256 4e20c7b7aa94f73af80e8344ead25f4980ec3e080af404e60b87eafd95d2f25a
 DIST ufo2000-music-20041222.zip 1661196 RMD160 4baa339c746da218e794743b608bc0fe15387442 SHA1 3e6deac66bc84754f651a8fe983426df20c0a563 SHA256 45fe31944de38c160e145cf2b2eedf42f9d0cef66edfdb3d06132617e15104c6
-DIST xcomdemo.zip 1148768 RMD160 b160b2ad4314e787b471b38ea58abcf7846c4a0b SHA1 4d312038506e732735d34e52fbe173157186a1dd SHA256 11c0166cbb9e58a1f7bab0891626368c7ba86e2c1cbb8f596391602c9e9b893c
-EBUILD ufo2000-0.6.627.ebuild 2532 RMD160 d0c3e6c6cdd61a3467ee03a59d3e94b03b5dfd43 SHA1 3bd3e43cc7a51d330a3b82342909ac582ca22c55 SHA256 976a299068cf6878cfeba31995f94a55594fc7c39e7302864ecbc2dd55c2675d
-MD5 f3994aed37f14792c2c2b6b619f20a83 ufo2000-0.6.627.ebuild 2532
-RMD160 d0c3e6c6cdd61a3467ee03a59d3e94b03b5dfd43 ufo2000-0.6.627.ebuild 2532
-SHA256 976a299068cf6878cfeba31995f94a55594fc7c39e7302864ecbc2dd55c2675d ufo2000-0.6.627.ebuild 2532
-EBUILD ufo2000-0.7.1062.ebuild 2396 RMD160 dcdf27926a5528126dcca769b140efa13d9f0749 SHA1 662872c7560a210ca78b3cb4ca75832a7ce381f4 SHA256 df8ab395b1c7674d81a48610b0fef05367a8f99dc0a3a6d12d21b816ff68cf73
-MD5 c75ee11af6d62ae7c96eb57d2657079b ufo2000-0.7.1062.ebuild 2396
-RMD160 dcdf27926a5528126dcca769b140efa13d9f0749 ufo2000-0.7.1062.ebuild 2396
-SHA256 df8ab395b1c7674d81a48610b0fef05367a8f99dc0a3a6d12d21b816ff68cf73 ufo2000-0.7.1062.ebuild 2396
-MISC ChangeLog 2574 RMD160 9c4ca28f1d88b0504a887ba1ba2f21beb96cc625 SHA1 66915dedef0a7bade929127e413553573b89b1da SHA256 7105dfdc6263853e599e1df814ac8f4299ef0e286cf8913e7e11e38855183516
-MD5 1c6b359902e0439480a7f2706290e11e ChangeLog 2574
-RMD160 9c4ca28f1d88b0504a887ba1ba2f21beb96cc625 ChangeLog 2574
-SHA256 7105dfdc6263853e599e1df814ac8f4299ef0e286cf8913e7e11e38855183516 ChangeLog 2574
+EBUILD ufo2000-0.7.1062.ebuild 2302 RMD160 0b554e59726b27889d719d02bf4dc11895afacc3 SHA1 fca9bea86c7f8b889c94a0dae644a8e79484d5ba SHA256 769cd809cf8f822b0c4257f4dcee2747a2f87efa972d95c6df9bf5d9d479e8a7
+MD5 071e87111c2475396ee244e1de2d391c ufo2000-0.7.1062.ebuild 2302
+RMD160 0b554e59726b27889d719d02bf4dc11895afacc3 ufo2000-0.7.1062.ebuild 2302
+SHA256 769cd809cf8f822b0c4257f4dcee2747a2f87efa972d95c6df9bf5d9d479e8a7 ufo2000-0.7.1062.ebuild 2302
+MISC ChangeLog 2767 RMD160 683661eb9d31cc0aac3544c01a92a2cb32758ecc SHA1 cb3515d582278620dc88fa073892fb53e22bc791 SHA256 a71ede8ad9f41c0e196e63836e91158fdc822d82d3560d72e04236875e108471
+MD5 82d871332db1b35832f348ead7247656 ChangeLog 2767
+RMD160 683661eb9d31cc0aac3544c01a92a2cb32758ecc ChangeLog 2767
+SHA256 a71ede8ad9f41c0e196e63836e91158fdc822d82d3560d72e04236875e108471 ChangeLog 2767
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 37b8b8bf481fa1c70b7735ef2a0e0f61 files/digest-ufo2000-0.6.627 958
-RMD160 704bea66c2520794eb9290ce4c364f9318341a88 files/digest-ufo2000-0.6.627 958
-SHA256 b7af2f1bf2a0a61dbc9d9dde6bf7a05a718b3c0accfa54a4aadd0e410fe2c7c9 files/digest-ufo2000-0.6.627 958
 MD5 5f1a2c2c47a7d3d84bfbed6a235aba60 files/digest-ufo2000-0.7.1062 530
 RMD160 f499b6cd579c5084bc4d51233a5d2ce7bf1fd3e4 files/digest-ufo2000-0.7.1062 530
 SHA256 f56ac1e557c32d308afee97856d4a9cc4238d741f6fca4dae529e09e55c9c8d4 files/digest-ufo2000-0.7.1062 530
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFUAN6dz7hIScOURERAjRtAKDzItJcf56iZKjKlMdKsxR45MZdtACfaZNC
+AkuimVarNfBGyi25xZsUUIM=
+=qDvr
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627 b/games-strategy/ufo2000/files/digest-ufo2000-0.6.627
deleted file mode 100644
index 59ebe3ed229a..000000000000
--- a/games-strategy/ufo2000/files/digest-ufo2000-0.6.627
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 0267a027ec437bf1b93e0cb1394a2c46 terror.zip 1096279
-RMD160 eeed8764d8cc26ddf4c57179f17d7eabaf85ec72 terror.zip 1096279
-SHA256 9af0930f6aade6cc02355c3d0354e9ccca4989f22636a013b3c34b2e55336cc8 terror.zip 1096279
-MD5 ee14e98c8e751cfaa734aeeb52fef4cf ufo2000-0.6.627-src.tar.bz2 795646
-RMD160 fbe561bcfeb85f63869f030d46bc40ebb274ae6f ufo2000-0.6.627-src.tar.bz2 795646
-SHA256 c34ae7525d222e506f77ec8de4ea34704a5b4a1f785433e245ec6b5683f00eaa ufo2000-0.6.627-src.tar.bz2 795646
-MD5 92df4c6e94ec7b2f0d720aecb1e4e68e ufo2000-music-20041222.zip 1661196
-RMD160 4baa339c746da218e794743b608bc0fe15387442 ufo2000-music-20041222.zip 1661196
-SHA256 45fe31944de38c160e145cf2b2eedf42f9d0cef66edfdb3d06132617e15104c6 ufo2000-music-20041222.zip 1661196
-MD5 0cabff3ae8ad047fde1753e9075358b4 xcomdemo.zip 1148768
-RMD160 b160b2ad4314e787b471b38ea58abcf7846c4a0b xcomdemo.zip 1148768
-SHA256 11c0166cbb9e58a1f7bab0891626368c7ba86e2c1cbb8f596391602c9e9b893c xcomdemo.zip 1148768
diff --git a/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch b/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch
deleted file mode 100644
index 8b8c249e6196..000000000000
--- a/games-strategy/ufo2000/files/ufo2000-0.6.627-gcc41.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/global.h.old	2006-05-28 12:30:33.000000000 +0200
-+++ src/global.h	2006-05-28 12:31:10.000000000 +0200
-@@ -412,6 +412,7 @@
- extern DATAFILE *datafile;
- extern int NOTICEremote;
- extern Wind *info_win;
-+class Icon;
- extern Icon *icon;
- extern int g_time_limit;
- extern int g_p2_start_sit;
---- src/server.h.old	2006-05-28 12:31:30.000000000 +0200
-+++ src/server.h	2006-05-28 12:32:09.000000000 +0200
-@@ -40,7 +40,7 @@
-     NLsocket    m_socket;
- public:
-     virtual ~ClientServer();
--    bool ClientServer::connect(
-+    bool connect(
-         const std::string &host,
-         const std::string &proxy,
-         std::string &error_message);
-@@ -54,6 +54,7 @@
- /**
-  * Server side client-server connection
-  */
-+class ServerDispatch;
- class ServerClient
- {
- protected:
diff --git a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild b/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
deleted file mode 100644
index 9c750a859b7d..000000000000
--- a/games-strategy/ufo2000/ufo2000-0.6.627.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/ufo2000/ufo2000-0.6.627.ebuild,v 1.8 2006/09/27 14:25:32 nyhm Exp $
-
-inherit eutils games
-
-DESCRIPTION="Free multiplayer remake of X-COM (UFO: Enemy Unknown)"
-HOMEPAGE="http://ufo2000.sourceforge.net/"
-SRC_URI="http://ufo2000.lxnt.info/files/${P}-src.tar.bz2
-	ftp://ftp.microprose.com/pub/mps-online/x-com/xcomdemo.zip
-	ftp://ftp.microprose.com/pub/mps-online/demos/terror.zip
-	vorbis? ( http://ufo2000.lxnt.info/files/ufo2000-music-20041222.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc x86"
-IUSE="vorbis"
-
-RDEPEND="virtual/libc
-	dev-libs/expat
-	>=dev-games/hawknl-1.66
-	>=media-libs/allegro-4.0.0
-	vorbis? ( ~media-libs/aldumb-0.9.2
-		~media-libs/dumb-0.9.2
-		media-libs/libogg
-		media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	unpack ${P}-src.tar.bz2
-
-	cd "${S}/XCOMDEMO"
-	unpack xcomdemo.zip
-	unzip -qLL XCOM.EXE -d .. || die "unzip failed"
-	rm XCOM.EXE
-	mv ../xcomdemo/* "${S}/XCOMDEMO/" || die "mv failed"
-
-	cd "${S}/TFTDDEMO"
-	unpack terror.zip
-	unzip -qLL TFTD.ZIP || die "unzip failed"
-	rm TFTD.ZIP
-
-	if use vorbis ; then
-		cd "${S}/newmusic"
-		unpack ufo2000-music-20041222.zip
-	fi
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-}
-
-src_compile() {
-	local myconf
-
-	use vorbis && myconf="dumbogg=1"
-
-	emake \
-		DATA_DIR="${GAMES_DATADIR}/${PN}" \
-		OPTFLAGS="${CXXFLAGS}" \
-		${myconf} \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ufo2000 || die "dogamesbin failed"
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -R arts newmaps newmusic newunits init-scripts script \
-		XCOMDEMO XCOM TFTDDEMO TFTD translations \
-		*.dat ufo2000.default.ini soundmap.xml \
-			"${D}/${GAMES_DATADIR}/${PN}" \
-				|| die "cp failed"
-	keepdir "${GAMES_DATADIR}/${PN}/newmusic"
-	echo "Please copy data files from X-COM here" > \
-		"${D}/${GAMES_DATADIR}/${PN}/XCOM/readme.txt"
-	echo "Please copy data files from TFTD here" > \
-		"${D}/${GAMES_DATADIR}/${PN}/TFTD/readme.txt"
-	dodoc *.txt AUTHORS ChangeLog || die "dodoc failed"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "If you have a full version of X-COM, you can copy all the files"
-	einfo "from the directory where you have it installed into:"
-	einfo "   ${GAMES_DATADIR}/${PN}/XCOM"
-	echo
-	einfo "Likewise for Terror From The Deep, but to the directory:"
-	einfo "   ${GAMES_DATADIR}/${PN}/TFTD"
-	echo
-	einfo "This will allow you to use more terrain types and units."
-	echo
-}