diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2004-02-23 19:45:06 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-02-23 19:45:06 +0000 |
commit | eeca577b2c219ef3074ded45e0b7bd3ab877256c (patch) | |
tree | 6bd747759f964d7e07d5c2cffe79e00ef1fe7b29 /x11-base/xfree | |
parent | Fixed bug #39589 and cleanup old files. (diff) | |
download | historical-eeca577b2c219ef3074ded45e0b7bd3ab877256c.tar.gz historical-eeca577b2c219ef3074ded45e0b7bd3ab877256c.tar.bz2 historical-eeca577b2c219ef3074ded45e0b7bd3ab877256c.zip |
Add bindist support for binary distribution in GRP sets.
Diffstat (limited to 'x11-base/xfree')
-rw-r--r-- | x11-base/xfree/ChangeLog | 5 | ||||
-rw-r--r-- | x11-base/xfree/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xfree/xfree-4.3.0-r5.ebuild | 13 |
3 files changed, 13 insertions, 9 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 5d6cfa87b673..b0785e60cb51 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.288 2004/02/18 19:25:20 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.289 2004/02/23 19:45:06 spyderous Exp $ + + 23 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r5.ebuild: + Add bindist support for binary distribution in GRP sets. 18 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.2.1-r3.ebuild, xfree-4.3.0-r4.ebuild: diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index 74a0fa5c026b..34d29a02959e 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,7 +1,7 @@ -MD5 f276c7a5b086203830402e5850c56524 ChangeLog 64696 +MD5 16fbad1ba8d8bfafd0068ce742a59b15 ChangeLog 64834 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 MD5 612aaaeec51b7e755cefb96a875ceca8 xfree-4.2.1-r4.ebuild 23723 -MD5 fea0accf0a6a8316f3dc61ec3ef318e1 xfree-4.3.0-r5.ebuild 34698 +MD5 9bc42976811527cb43d08c00541f8460 xfree-4.3.0-r5.ebuild 34798 MD5 e1f367211ef51667347fa209071ef859 xfree-4.3.99.902-r2.ebuild 31191 MD5 cc52e1577d984cd2a2bbb05148291095 files/digest-xfree-4.2.1-r4 1342 MD5 a80dd36e88ff79e9019049017fee8cd6 files/digest-xfree-4.3.0-r5 2002 diff --git a/x11-base/xfree/xfree-4.3.0-r5.ebuild b/x11-base/xfree/xfree-4.3.0-r5.ebuild index c6ab8d5de9fc..c779ee022451 100644 --- a/x11-base/xfree/xfree-4.3.0-r5.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r5.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.2 2004/02/17 22:51:27 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r5.ebuild,v 1.3 2004/02/23 19:45:06 spyderous Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... RESTRICT="nostrip" -IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk" +IUSE="3dfx sse mmx 3dnow xml2 truetype nls cjk doc ipv6 debug static pam sdk bindist" filter-flags "-funroll-loops" @@ -110,13 +110,14 @@ SRC_URI="${SRC_URI} mirror://gentoo/XFree86-locale.alias.bz2 mirror://gentoo/XFree86-locale.dir.bz2 mirror://gentoo/gentoo-cursors-tad-${XCUR_VER}.tar.bz2 - truetype? ( ${MS_FONT_URLS} )" + truetype? ( !bindist? ( ${MS_FONT_URLS} ) )" LICENSE="X11 MSttfEULA" SLOT="0" KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64" DEPEND=">=sys-apps/baselayout-1.8.3 + >=sys-apps/portage-2.0.50_pre9 >=sys-libs/ncurses-5.1 >=sys-libs/zlib-1.1.3-r2 >=sys-devel/flex-2.5.4a-r5 @@ -132,7 +133,7 @@ DEPEND=">=sys-apps/baselayout-1.8.3 media-libs/libpng app-arch/unzip pam? ( >=sys-libs/pam-0.75 ) - truetype? ( app-arch/cabextract ) + truetype? ( !bindist? ( app-arch/cabextract ) ) !x11-libs/xft" #RDEPEND="$DEPEND" # unzip - needed for savage driver (version 1.1.27t) @@ -307,7 +308,7 @@ src_unpack() { fi # Unpack the MS fonts - if use truetype + if use truetype && use !bindist then einfo "Unpacking MS Core Fonts..." mkdir -p ${WORKDIR}/truetype; cd ${WORKDIR}/truetype @@ -692,7 +693,7 @@ src_install() { newins ${S}/programs/Xserver/hw/xfree86/XF86Config XF86Config.example # Install MS fonts. - if use truetype + if use truetype && use !bindist then ebegin "Installing MS Core Fonts" dodir /usr/X11R6/lib/X11/fonts/truetype |