summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-04 20:45:34 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-04 20:45:34 +0000
commita876b9b86c4b76174e84a1756c81553a8f5b384a (patch)
tree4402b51961b60c670b299c56aacc5819954dea22 /app-emulation/wine/wine-20050211.ebuild
parentCleanup. (diff)
downloadhistorical-a876b9b86c4b76174e84a1756c81553a8f5b384a.tar.gz
historical-a876b9b86c4b76174e84a1756c81553a8f5b384a.tar.bz2
historical-a876b9b86c4b76174e84a1756c81553a8f5b384a.zip
Cleanup modular X handling in all ebuilds and cleanup lcms handling #167240.
Package-Manager: portage-2.1.2-r14
Diffstat (limited to 'app-emulation/wine/wine-20050211.ebuild')
-rw-r--r--app-emulation/wine/wine-20050211.ebuild28
1 files changed, 14 insertions, 14 deletions
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 128127d84a44..e7d51ec7f996 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.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/app-emulation/wine/wine-20050211.ebuild,v 1.25 2006/06/24 07:46:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.26 2007/03/04 20:45:33 vapier Exp $
inherit eutils flag-o-matic multilib
@@ -19,9 +19,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
media-fonts/corefonts
ncurses? ( >=sys-libs/ncurses-5.2 )
jack? ( media-sound/jack-audio-connection-kit )
- X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
- x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
- virtual/x11 )
+ X? (
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86vm
+ x11-apps/xmessage
)
arts? ( kde-base/arts )
alsa? ( media-libs/alsa-lib )
@@ -38,13 +41,11 @@ RDEPEND=">=media-libs/freetype-2.0.0
>=sys-kernel/linux-headers-2.6
)"
DEPEND="${RDEPEND}
- X? ( || ( ( x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- )
- virtual/x11
- )
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86dgaproto
+ x11-proto/xf86vidmodeproto
)
sys-devel/bison
doc? ( app-text/docbook-sgml-utils app-text/jadetex )
@@ -103,10 +104,9 @@ src_compile() {
config_cache glut lib_glut_glutMainLoop
config_cache jpeg header_jpeglib_h
config_cache oss header_sys_soundcard_h header_machine_soundcard_h header_soundcard_h
- config_cache lcms header_lcms_h
+ config_cache lcms header_lcms_h header_lcms_lcms_h
strip-flags
- use lcms && append-flags -I"${ROOT}"/usr/include/lcms
if ! built_with_use app-text/docbook-sgml-utils tetex ; then
export DB2PDF=true