Fixing runtime depedency for gtk/Xaw3d/sdl selection

Package-Manager: portage-2.1.3.19

4 files changed, 31 insertions, 31 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 86cc7223fca6..a9263a5c8916 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.65 2007/11/30 19:47:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.66 2007/11/30 22:14:44 tupone Exp $
+
+  30 Nov 2007; Tupone Alfredo <tupone@gentoo.org> freeciv-2.0.9.ebuild,
+  freeciv-2.1.1.ebuild:
+  Fixing runtime depedency for gtk/Xaw3d/sdl selection
 
   30 Nov 2007; Tupone Alfredo <tupone@gentoo.org> freeciv-2.0.9.ebuild,
   freeciv-2.1.1.ebuild:
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 5ff11f73f7d3..32ab3e1d9fc4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -5,18 +5,18 @@ DIST freeciv-2.0.9.tar.bz2 8875323 RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158
 DIST freeciv-2.1.1.tar.bz2 29574047 RMD160 0b3cb62ea00bd9ae8086d00eb872d97e0032bcb0 SHA1 95c342d3e9d713be550c8e68aa6c30723f336c84 SHA256 5eb4681bb6c8b16877b7f86ce5fe36678f521c1b5f70e00ce0defaeac35c3211
 DIST freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd SHA1 929520ea26f3e3093f8ab1984ffd61c99c154511 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160
 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
-EBUILD freeciv-2.0.9.ebuild 4723 RMD160 584d1324cc7f74d83fda4467c5bf26f305cb9728 SHA1 b6d25d56d6b1689be26136e0335dac349fada96e SHA256 85eccc92748cdd38fab6cec05ca5065d33608e1d9c6d1e0b1321391dd24dc741
-MD5 8f98b84ea0e6c6eb786a9faa5e3d2ff7 freeciv-2.0.9.ebuild 4723
-RMD160 584d1324cc7f74d83fda4467c5bf26f305cb9728 freeciv-2.0.9.ebuild 4723
-SHA256 85eccc92748cdd38fab6cec05ca5065d33608e1d9c6d1e0b1321391dd24dc741 freeciv-2.0.9.ebuild 4723
-EBUILD freeciv-2.1.1.ebuild 4928 RMD160 40ebf5f8e994ba0b0f6de6d5ecb45db678b1a7b3 SHA1 e46cf8f2d3e10cf4b0256b0cd26f64ff3c643fcb SHA256 76c7800e9842ec194360e853c9a4455ed962b6503438e0e8ffe160471ad92456
-MD5 5dec749d7ea00303175df3d09a2c9ee8 freeciv-2.1.1.ebuild 4928
-RMD160 40ebf5f8e994ba0b0f6de6d5ecb45db678b1a7b3 freeciv-2.1.1.ebuild 4928
-SHA256 76c7800e9842ec194360e853c9a4455ed962b6503438e0e8ffe160471ad92456 freeciv-2.1.1.ebuild 4928
-MISC ChangeLog 10356 RMD160 e47367d2cdcfed57c466d5b5616f667e4cff1e16 SHA1 f3003d2d1e8391d4fd9e8eeb85d334cfda42c078 SHA256 93d28ee9bffabee754a52eed8988893c7e793b749df1434982a2a9d949a34b3b
-MD5 94be5f739d1fe525e66d02cd15522c6b ChangeLog 10356
-RMD160 e47367d2cdcfed57c466d5b5616f667e4cff1e16 ChangeLog 10356
-SHA256 93d28ee9bffabee754a52eed8988893c7e793b749df1434982a2a9d949a34b3b ChangeLog 10356
+EBUILD freeciv-2.0.9.ebuild 4686 RMD160 649722a1dece7db2b14fcb6ae08c4033788331ae SHA1 caded4017276ad51628e2fe88b2be818e36a23c9 SHA256 2bd702d8c5ded16882f196455deb32f87117d543b67b7719da235afc90f08497
+MD5 dd6966467b88abd269be68fab60fb48a freeciv-2.0.9.ebuild 4686
+RMD160 649722a1dece7db2b14fcb6ae08c4033788331ae freeciv-2.0.9.ebuild 4686
+SHA256 2bd702d8c5ded16882f196455deb32f87117d543b67b7719da235afc90f08497 freeciv-2.0.9.ebuild 4686
+EBUILD freeciv-2.1.1.ebuild 4896 RMD160 7c198132162e412015ff63a0b4588e6cfe8b75a0 SHA1 c83df82683b722f1eeefd017922548b0eac24dee SHA256 db0f8ba278ba8ba6ee52f7732a33e1745e15caee4eb4a3149818a1f30e5a9b8c
+MD5 5a3be495193a23799d56f0f75c23deb5 freeciv-2.1.1.ebuild 4896
+RMD160 7c198132162e412015ff63a0b4588e6cfe8b75a0 freeciv-2.1.1.ebuild 4896
+SHA256 db0f8ba278ba8ba6ee52f7732a33e1745e15caee4eb4a3149818a1f30e5a9b8c freeciv-2.1.1.ebuild 4896
+MISC ChangeLog 10508 RMD160 771300615cbd35abd79cca48c4e0fdf91a32d56b SHA1 9ef3bb35207adaab1f9393e528842dca06eab40b SHA256 ac662a5c1eeb58388d1c3080b8e41651510d7147175d646ddaae4031ad2c022d
+MD5 a3d3c34d40b071dfd8fe6bdde280b3ec ChangeLog 10508
+RMD160 771300615cbd35abd79cca48c4e0fdf91a32d56b ChangeLog 10508
+SHA256 ac662a5c1eeb58388d1c3080b8e41651510d7147175d646ddaae4031ad2c022d ChangeLog 10508
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -30,7 +30,7 @@ SHA256 aa5c9f7e4ffc1db095541e2ee53be4cf031c186fc649b9e44fa6360adff2c0c0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHUGjs8qKy9+b2Hl0RAh3AAJ9DayZUMHhKb0EvOfFDEG4BsIi6kQCfcPKo
-mC/G/u/esSOG+jKovdiC2RY=
-=HCXS
+iD8DBQFHUItf8qKy9+b2Hl0RArSkAKCn+64npOI3NJr3mDjeaVKM3x4zIgCgmOMa
+Yn+zNMapK7pyRME5fsdh16A=
+=pcSp
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/freeciv-2.0.9.ebuild b/games-strategy/freeciv/freeciv-2.0.9.ebuild
index f849a98217b3..4165b84a0283 100644
--- a/games-strategy/freeciv/freeciv-2.0.9.ebuild
+++ b/games-strategy/freeciv/freeciv-2.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.9.ebuild,v 1.5 2007/11/30 19:47:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.9.ebuild,v 1.6 2007/11/30 22:14:44 tupone Exp $
 
 inherit eutils games
 
@@ -28,10 +28,9 @@ RDEPEND="readline? ( sys-libs/readline )
 		nls? ( virtual/libintl )
 		gtk? ( >=x11-libs/gtk+-2 )
 		!gtk? (
+			media-libs/libpng
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? ( x11-libs/libXaw )
-			x11-libs/libXmu
-			x11-libs/libXpm
 		)
 		alsa? (
 			media-libs/alsa-lib
@@ -46,7 +45,6 @@ DEPEND="${RDEPEND}
 	!dedicated? (
 		gtk? ( dev-util/pkgconfig )
 		x11-proto/xextproto
-		media-libs/libpng
 	)"
 
 S=${WORKDIR}/${MY_P}
diff --git a/games-strategy/freeciv/freeciv-2.1.1.ebuild b/games-strategy/freeciv/freeciv-2.1.1.ebuild
index 8abcde0efa12..855ec5f06844 100644
--- a/games-strategy/freeciv/freeciv-2.1.1.ebuild
+++ b/games-strategy/freeciv/freeciv-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.1.ebuild,v 1.2 2007/11/30 19:47:49 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.1.ebuild,v 1.3 2007/11/30 22:14:44 tupone Exp $
 
 inherit eutils games
 
@@ -28,15 +28,14 @@ RDEPEND="readline? ( sys-libs/readline )
 		nls? ( virtual/libintl )
 		gtk? ( >=x11-libs/gtk+-2 )
 		!gtk? (
-			sdl? (
-				media-libs/libsdl
-				media-libs/sdl-image
-			)
-			!sdl? (
-				Xaw3d? ( x11-libs/Xaw3d )
-				!Xaw3d? ( x11-libs/libXaw )
-				x11-libs/libXmu
-				x11-libs/libXpm
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				sdl? (
+					media-libs/libsdl
+					media-libs/sdl-image
+					media-libs/freetype
+				)
+				!sdl? ( x11-libs/libXaw )
 			)
 		)
 		alsa? (
@@ -52,7 +51,6 @@ DEPEND="${RDEPEND}
 	!dedicated? (
 		gtk? ( dev-util/pkgconfig )
 		x11-proto/xextproto
-		media-libs/libpng
 	)"
 
 S=${WORKDIR}/${MY_P}