diff options
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.8.5.5.ebuild | 16 | ||||
| -rw-r--r-- | x11-base/xfree/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.2.1-r2.ebuild | 10 |
4 files changed, 30 insertions, 9 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 4388ddde30c2..052a702d6764 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.48 2002/12/10 20:10:24 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.49 2002/12/16 18:43:48 azarah Exp $ + + 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> baselayout-1.8.5.5.ebuild : + + Fix /usr/lib/X11 symlink. Change gawk module to compile if + /usr/include/awk/awk.h exists. *baselayout-1.8.5.5 (09 Dec 2002) diff --git a/sys-apps/baselayout/baselayout-1.8.5.5.ebuild b/sys-apps/baselayout/baselayout-1.8.5.5.ebuild index 42b9114fc519..02d5873344f2 100644 --- a/sys-apps/baselayout/baselayout-1.8.5.5.ebuild +++ b/sys-apps/baselayout/baselayout-1.8.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.5.ebuild,v 1.2 2002/12/10 20:10:24 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.5.5.ebuild,v 1.3 2002/12/16 18:43:48 azarah Exp $ IUSE="bootstrap build" @@ -110,7 +110,7 @@ src_compile() { einfo "Building sysvinit..." emake LDFLAGS="" || die "problem compiling sysvinit" - if [ -z "`use bootstrap`" ] + if [ -f /usr/include/awk/awk.h ] then # Build gawk module cd ${S}/src @@ -167,11 +167,11 @@ src_install() { keepdir /home keepdir /usr/include /usr/src /usr/portage - keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib/X11 + keepdir /usr/X11R6/include/{X11,GL} /usr/X11R6/lib dosym ../X11R6/include/X11 /usr/include/X11 dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/lib /usr/lib/X11 #dosym ../src/linux/include/linux /usr/include/linux #dosym ../src/linux/include/asm-i386 /usr/include/asm @@ -404,6 +404,12 @@ pkg_preinst() { then rm -f ${ROOT}/etc/init.d/rc-help.sh fi + + # This one was borked, so make sure fixed one gets installed. + if [ -L ${ROOT}/usr/lib/X11 ] + then + rm -f ${ROOT}/usr/lib/X11 + fi } pkg_postinst() { @@ -537,6 +543,6 @@ pkg_postrm() { # Fix problematic links ln -snf ../X11R6/include/X11 ${ROOT}/usr/include/X11 ln -snf ../X11R6/include/GL ${ROOT}/usr/include/GL - ln -snf ../X11R6/lib/X11 ${ROOT}/usr/lib/X11 + ln -snf ../X11R6/lib ${ROOT}/usr/lib/X11 } diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index e55f5896f100..69339ae47e3b 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xfree # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.71 2002/12/13 05:06:24 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.72 2002/12/16 18:39:05 azarah Exp $ + + 16 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : + + Fix /usr/lib/X11 symlink. 13 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild : diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild index ad4d8d07fca7..a01275063f72 100644 --- a/x11-base/xfree/xfree-4.2.1-r2.ebuild +++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.6 2002/12/15 10:44:24 bjb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.7 2002/12/16 18:39:05 azarah Exp $ IUSE="sse nls mmx truetype 3dnow 3dfx" @@ -388,7 +388,7 @@ src_install() { dosym ../X11R6/include/X11 /usr/include/X11 dosym ../X11R6/include/DPS /usr/include/DPS dosym ../X11R6/include/GL /usr/include/GL - dosym ../X11R6/lib/X11 /usr/lib/X11 + dosym ../X11R6/lib /usr/lib/X11 dosym ../../usr/X11R6/lib/X11/xkb /etc/X11/xkb # Some critical directories @@ -553,6 +553,12 @@ pkg_preinst() { mv -f ${ROOT}/etc/X11/xkb ${ROOT}/usr/X11R6/lib/X11 fi + # This one was borked, so make sure fixed one gets installed. + if [ -L ${ROOT}/usr/lib/X11 ] + then + rm -f ${ROOT}/usr/lib/X11 + fi + # clean the dinamic libGL stuff's home to ensure # we dont have stale libs floating around if [ -d ${ROOT}/usr/lib/opengl/xfree ] |