summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul de Vrieze <pauldv@gentoo.org>2003-07-29 10:39:02 +0000
committerPaul de Vrieze <pauldv@gentoo.org>2003-07-29 10:39:02 +0000
commitb134eb5899d94ab676064c4ac9dcbd7f2fed7170 (patch)
treed78ed3404d45cc5bc0e6863fb8ff4b81830eec0a /eclass/kde-functions.eclass
parentPut emake back (diff)
downloadgentoo-2-b134eb5899d94ab676064c4ac9dcbd7f2fed7170.tar.gz
gentoo-2-b134eb5899d94ab676064c4ac9dcbd7f2fed7170.tar.bz2
gentoo-2-b134eb5899d94ab676064c4ac9dcbd7f2fed7170.zip
autotools fixes, and added a function to make them be detected in a way that we can work with
Diffstat (limited to 'eclass/kde-functions.eclass')
-rw-r--r--eclass/kde-functions.eclass34
1 files changed, 32 insertions, 2 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 022a159aa2e5..f028f9a9bcf4 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -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/eclass/kde-functions.eclass,v 1.59 2003/07/01 11:51:43 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.60 2003/07/29 10:39:02 pauldv Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -63,6 +63,10 @@ need-kde() {
need-autoconf 2.1
need-automake 1.4
;;
+ 3.1.[23]) # Newer 3.1.x versions are built with automake 1.7, and have errors when using 1.6
+ need-automake 1.7
+ need-autoconf 2.5
+ ;;
3.1*) # actually, newer 3.0.x stuff uses this too, but i want to make a clean switch
need-automake 1.6
need-autoconf 2.5
@@ -73,7 +77,7 @@ need-kde() {
;;
5*)
need-autoconf 2.5
- need-automake 1.6
+ need-automake 1.7
;;
esac
@@ -90,6 +94,10 @@ need-kde() {
# maybe i should look at relocating it...
if [ "$PV" == "3.0.3" ]; then
newdepend "=kde-base/kdelibs-3.0.3*"
+ elif [ "$PV" == "3.1.3" ]; then
+ newdepend "=kde-base/kdelibs-3.1.3*"
+ elif [ "$PV" == "3.1.2" ]; then
+ newdepend "=kde-base/kdelibs-3.1.2*"
elif [ "$PV" == "3.1.1" ]; then
newdepend "=kde-base/kdelibs-3.1.1*"
elif [ "$PV" == "2.2.2" ]; then
@@ -306,6 +314,28 @@ min-kde-ver() {
}
+# This function should fix the broken automake detection in the detect-autoconf file
+kde_fix_autodetect() {
+ cd ${S}/admin
+ patch -p0 <<EOF
+--- arts-1.1.3/admin/detect-autoconf.sh 2003-05-07 13:50:14.000000000 +0200
++++ detect-autoconf.sh 2003-07-29 12:21:39.000000000 +0200
+@@ -52,7 +52,10 @@
+ checkAutomakeAclocal ()
+ {
+ if test -z "\$UNSERMAKE"; then
+- if test -x "\`\$WHICH automake-1.5\`" ; then
++ if test -x "\`\$WHICH automake\`" ; then
++ AUTOMAKE="\`\$WHICH automake\`"
++ ACLOCAL="\`\$WHICH aclocal\`"
++ elif test -x "\`\$WHICH automake-1.5\`" ; then
+ AUTOMAKE="\`\$WHICH automake-1.5\`"
+ ACLOCAL="\`\$WHICH aclocal-1.5\`"
+ elif test -x "\`\$WHICH automake-1.6\`" ; then
+EOF
+ cd -
+}
+
# generic makefile sed for sandbox compatibility. for some reason when the kde makefiles (of many packages
# and versions) try to chown root and chmod 4755 some binaries (after installing, target isntall-exec-local),
# they do it to the files in $(bindir), not $(DESTDIR)/$(bindir). Most of these have been fixed in latest cvs