diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/Manifest | 5 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r2 | 2 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r2.ebuild | 39 |
3 files changed, 33 insertions, 13 deletions
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index 587e6fdbca28..bb8efb150b6d 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,13 +1,12 @@ MD5 32960690f1f4c20d57b427d1db5eb85c xfree-4.3.0.ebuild 24877 -MD5 9e27ec7073a092a152fbd1915793b8b6 .#xfree-4.3.0-r2.ebuild.1.6 27851 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963 MD5 69091bec71465197dc2f80366eff6924 xfree-4.2.1-r1.ebuild 23158 -MD5 57bac866b67a063a9d64f884f90d6138 xfree-4.3.0-r2.ebuild 28233 +MD5 3b3a1f9e4c5f117b3f69e62ae3c0eae9 xfree-4.3.0-r2.ebuild 28234 MD5 825bc2b98968ff9a0722de4c3ac9ba0e xfree-4.2.1.ebuild 18563 MD5 246764b7aaa72b0eeb35fa94f2f1dd0d manifest 10486 MD5 d4a679808c5efc36d64b69c19f515508 xfree-4.3.0-r1.ebuild 24862 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195 -MD5 90aeee3a0284552c5562b8312f95dc4a ChangeLog 24916 +MD5 9c80167405329f5f049fe3c483eb7ce9 ChangeLog 25104 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666 diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2 index bf1824d5dd5e..0a820be1ec89 100644 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r2 +++ b/x11-base/xfree/files/digest-xfree-4.3.0-r2 @@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 -MD5 6195649f29fe55e6eea57564d46fbba1 XFree86-4.3.0-patches-1.0.5.tar.bz2 415164 +MD5 618d31cbf87055c59b10f11bf7694a59 XFree86-4.3.0-patches-1.0.6.tar.bz2 416382 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild index cb764dd0e2b9..015dc5e9dccd 100644 --- a/x11-base/xfree/xfree-4.3.0-r2.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 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-r2.ebuild,v 1.7 2003/04/13 01:02:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.8 2003/04/13 13:11:40 seemant 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 ... @@ -40,7 +40,7 @@ strip-flags # Are we using a snapshot ? USE_SNAPSHOT="no" -PATCH_VER="1.0.5" +PATCH_VER="1.0.6" FT2_VER="2.1.3" SISDRV_VER="060403-1" SAVDRV_VER="1.1.27t" @@ -137,7 +137,7 @@ src_unpack() { unpack XFree86-${PV}-patches-${PATCH_VER}.tar.bz2 # Unpack extra fonts stuff from Mandrake - unpack gemini-koi8-u.tar.bz2 || die + unpack gemini-koi8-u.tar.bz2 unpack eurofonts-X11.tar.bz2 unpack xfsft-encodings.tar.bz2 @@ -178,6 +178,11 @@ src_unpack() { rm -f ${WORKDIR}/patch/202_all_4.2.99.3-acecad-debug.patch.bz2 fi + if [ "`use 3dfx`" -a "${TDFX_RISKY}" = "yes" ] + then + rm #{WORKDIR}/patch/075* + fi + # Various Patches from all over EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patch/ @@ -332,6 +337,17 @@ src_unpack() { echo "#define UseFontconfig YES" >> config/cf/host.def echo "#define HasFontconfig YES" >> config/cf/host.def +# Will uncomment this after kde, qt, and *box ebuilds are alterered to use +# it +# if use xinerama +# then +# echo "#define BuildXinerama YES" >> config/cf/host.def +# echo "#define BuildXineramaLibrary YES" >> config/cf/host.def +# fi + + # Default to whiteglass maybe? + echo "#define DefaultCursorTheme whiteglass" >> config/cf/host.def + # End the host.def definitions here eend 0 @@ -678,6 +694,11 @@ src_install() { strip --strip-debug ${x} || : fi done + + ebegin "Setting Default Cursor Theme to whiteglass" + sed -i "s:core:whiteglass:" \ + ${D}/usr/share/cursors/xfree/default/index.theme + eend 0 } pkg_preinst() { @@ -816,12 +837,6 @@ pkg_postinst() { -- ${ROOT}/usr/X11R6/lib/X11/fonts/encodings eend 0 - ebegin "Generating koi8 fonts..." - LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \ - ${ROOT}/usr/X11R6/bin/mkfontdir \ - ${ROOT}/usr/X11R6/lib/X11/fonts/ukr - eend 0 - if [ -x ${ROOT}/usr/X11R6/bin/ttmkfdir ] then ebegin "Creating fonts.scale files..." @@ -942,6 +957,12 @@ pkg_postinst() { ewarn "If you experience font corruption on OpenOffice.org or similar" ewarn "glitches please remake your XF86Config" echo + + einfo "Please note that the xcursors are in /usr/share/cursors/xfree" + einfo "Any custom cursor sets should be placed in that directory" + einfo "This is different from the previous versions of 4.3 and" + einfo "the 4.2.99 series." + } pkg_postrm() { |