Version bump to latest, only few bugfixes straight to stable, remove older.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)

3 files changed, 9 insertions, 80 deletions

diff --git a/app-office/calligra-l10n/ChangeLog b/app-office/calligra-l10n/ChangeLog
index b0516b25d24c..5cfd2f62d3b3 100644
--- a/app-office/calligra-l10n/ChangeLog
+++ b/app-office/calligra-l10n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/calligra-l10n
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/ChangeLog,v 1.26 2012/09/13 12:04:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/ChangeLog,v 1.27 2012/11/04 10:27:13 scarabeus Exp $
+
+*calligra-l10n-2.5.3 (04 Nov 2012)
+
+  04 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +calligra-l10n-2.5.3.ebuild,
+  -calligra-l10n-2.4.3.ebuild, -calligra-l10n-2.5.2.ebuild:
+  Version bump to latest, only few bugfixes straight to stable, remove older.
 
 *calligra-l10n-2.5.2 (13 Sep 2012)
 
diff --git a/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild b/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild
deleted file mode 100644
index e0ce10a257a8..000000000000
--- a/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.5.2.ebuild,v 1.1 2012/09/13 12:04:43 scarabeus Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="!app-office/koffice-l10n"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)
-	)
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.4.3.ebuild b/app-office/calligra-l10n/calligra-l10n-2.5.3.ebuild
index ea656dc8bee7..d2c4dc324ab9 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.4.3.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.3.ebuild,v 1.3 2012/08/09 12:10:08 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.5.3.ebuild,v 1.1 2012/11/04 10:27:13 scarabeus Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ RDEPEND="!app-office/koffice-l10n"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
+MY_LANGS="ca da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
 URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
 SRC_URI=""
 SLOT="4"