diff options
author | 2005-05-25 19:52:35 +0000 | |
---|---|---|
committer | 2005-05-25 19:52:35 +0000 | |
commit | 8234699018e2444f9f8faf66ebc57a0dd9234c4e (patch) | |
tree | 917af2d78791a0d4cf0f5488f8f7edd6a6bd5bbf | |
parent | Multilib fixes. (diff) | |
download | gentoo-2-8234699018e2444f9f8faf66ebc57a0dd9234c4e.tar.gz gentoo-2-8234699018e2444f9f8faf66ebc57a0dd9234c4e.tar.bz2 gentoo-2-8234699018e2444f9f8faf66ebc57a0dd9234c4e.zip |
add SRC_URI for 3.4.1
-rw-r--r-- | eclass/kde-meta.eclass | 31 | ||||
-rw-r--r-- | eclass/kde.eclass | 12 |
2 files changed, 22 insertions, 21 deletions
diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass index aa4b6391454b..88ab7cb1c712 100644 --- a/eclass/kde-meta.eclass +++ b/eclass/kde-meta.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.32 2005/05/25 16:27:06 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.33 2005/05/25 19:52:35 danarmak Exp $ # # Author Dan Armak <danarmak@gentoo.org> # Simone Gotti <motaboy@gentoo.org> @@ -57,17 +57,20 @@ if [ "$KDEBASE" = "true" ]; then # Does anyone really want to make this code generic based on $TARBALLVER above? case "$PV" in 3.4.0_beta1) XDELTA_BASE="unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2" - XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta" - ;; + XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta" + ;; 3.4.0_beta2) XDELTA_BASE="unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2" - XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta" - ;; - 3.4.0_rc1) XDELTA_BASE="unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2" - XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta unstable/3.4.0-rc1/src/$KMNAME-3.3.92-3.4.0-rc1.tar.xdelta" - ;; - 3.4.0) ;; # xdeltas break off at first stable version, since most people - # don't have prerelease tarballs handy - *) ;; + XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta" + ;; + 3.4.0_rc1) XDELTA_BASE="unstable/3.3.90/src/$KMNAME-3.3.90.tar.bz2" + XDELTA_DELTA="unstable/3.3.91/src/$KMNAME-3.3.90-3.3.91.tar.xdelta unstable/3.3.91/src/$KMNAME-3.3.91-3.3.92.tar.xdelta unstable/3.4.0-rc1/src/$KMNAME-3.3.92-3.4.0-rc1.tar.xdelta" + ;; + 3.4.0) ;; # xdeltas break off at first stable version, since most people + # don't have prerelease tarballs handy + 3.4.1) XDELTA_BASE="stable/3.4.0/src/$KMNAME-3.4.0.tar.bz2" + XDLELTA_DELTA="stable/3.4.1/src/$KMNAME-3.4.0-3.4.1.tar.xdelta" + ;; + *) ;; esac elif [ "$KMNAME" == "koffice" ]; then @@ -343,9 +346,9 @@ function kde-meta_src_unpack() { if [ "$KMNAME" == "kdebase" ]; then sed -i -e s:"bin_SCRIPTS = startkde"::g ${S}/Makefile.am.in fi - - # Visibility support is broken in KDE. Disable it when present until - # upstream finds a way to get it working properly. Bug 86898. + + # Visiblity stuff is way broken! Just disable it when it's present + # until upstream finds a way to have it working right. if grep HAVE_GCC_VISIBILITY configure &> /dev/null || ! [[ -f configure ]]; then find ${S} -name configure.in.in | xargs sed -i -e \ 's:KDE_ENABLE_HIDDEN_VISIBILITY::g' diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 49f1ff2368a9..9a726757ddec 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.118 2005/05/25 16:26:40 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.119 2005/05/25 19:52:35 danarmak Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -40,7 +40,6 @@ kde_pkg_setup() { } kde_src_unpack() { - debug-print-function $FUNCNAME $* # call base_src_unpack, which implements most of the functionality and has sections, @@ -62,12 +61,11 @@ kde_src_unpack() { debug-print "$FUNCNAME: touching .ui files..." touch $UIFILES fi - - # Visibility support is broken in KDE. Disable it when present until - # upstream finds a way to get it working properly. Bug 86898. + + # Visiblity stuff is way broken! Just disable it when it's present + # until upstream finds a way to have it working right. if grep HAVE_GCC_VISIBILITY configure &> /dev/null || ! [[ -f configure ]]; then - find ${S} -name configure.in.in | xargs sed -i -e \ - 's:KDE_ENABLE_HIDDEN_VISIBILITY::g' + find ${S} -name configure.in.in | xargs sed -i -e 's:KDE_ENABLE_HIDDEN_VISIBILITY::g' rm -f configure fi } |