diff options
| author |   Peter Volkov <pva@gentoo.org> | 2008-11-23 22:07:06 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2008-11-23 22:07:06 +0000 |
| commit | c7ffb7a005164ccd999573cb7f3df7e1f027ef57 (patch) | |
| tree | 15fb5e4b7754779ab11f49ba6d42058a92cb23c7 /kde-base/kde-i18n | |
| parent | Bump libvirt to 0.4.6 and fix a couple bugs. (diff) | |
| download | gentoo-2-c7ffb7a005164ccd999573cb7f3df7e1f027ef57.tar.gz gentoo-2-c7ffb7a005164ccd999573cb7f3df7e1f027ef57.tar.bz2 gentoo-2-c7ffb7a005164ccd999573cb7f3df7e1f027ef57.zip | |
Fixed slot conflict caused by hardcoding automake version, bug #248467.
(Portage version: 2.2_rc15/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)
Diffstat (limited to 'kde-base/kde-i18n')
| -rw-r--r-- | kde-base/kde-i18n/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kde-i18n/kde-i18n-3.5.10.ebuild | 6 | ||||
| -rw-r--r-- | kde-base/kde-i18n/kde-i18n-3.5.9.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog index 5d72ab7b5015..f7e2386f78b8 100644 --- a/kde-base/kde-i18n/ChangeLog +++ b/kde-base/kde-i18n/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kde-i18n # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.160 2008/09/13 23:57:43 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.161 2008/11/23 22:07:06 pva Exp $ + + 23 Nov 2008; Peter Volkov <pva@gentoo.org> kde-i18n-3.5.9.ebuild, + kde-i18n-3.5.10.ebuild: + Fixed slot conflict caused by hardcoding automake version, bug #248467. *kde-i18n-3.5.10 (13 Sep 2008) diff --git a/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild index b4f8113b0e5e..e84b163b289b 100644 --- a/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild +++ b/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild,v 1.1 2008/09/13 23:57:43 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.10.ebuild,v 1.2 2008/11/23 22:07:06 pva Exp $ EAPI="1" -WANT_AUTOMAKE="1.10.1" +WANT_AUTOMAKE="1.10" inherit kde eutils autotools @@ -15,6 +15,8 @@ SLOT="${KDEMAJORVER}.${KDEMINORVER}" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="" +DEPEND=">=sys-devel/automake-1.10.1" + need-kde ${PV} LANGS="af ar az bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk diff --git a/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild index 8ba0076e446a..81ade1959893 100644 --- a/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild +++ b/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild,v 1.8 2008/05/18 15:23:21 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.9.ebuild,v 1.9 2008/11/23 22:07:06 pva Exp $ EAPI="1" -WANT_AUTOMAKE="1.10.1" +WANT_AUTOMAKE="1.10" inherit kde eutils autotools @@ -15,6 +15,8 @@ SLOT="${KDEMAJORVER}.${KDEMINORVER}" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="" +DEPEND=">=sys-devel/automake-1.10.1" + need-kde ${PV} LANGS="af ar az bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk |