Dont install kdepim files if they are included in the tarballs, bug 366353

Package-Manager: portage-2.1.10.5/cvs/Linux x86_64

5 files changed, 307 insertions, 16 deletions

diff --git a/kde-base/kde-l10n/ChangeLog b/kde-base/kde-l10n/ChangeLog
index 3d942c32dbc4..12e1965d6d6f 100644
--- a/kde-base/kde-l10n/ChangeLog
+++ b/kde-base/kde-l10n/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kde-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.97 2011/07/09 15:13:54 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/ChangeLog,v 1.98 2011/07/13 16:17:04 dilfridge Exp $
+
+*kde-l10n-4.6.5-r1 (13 Jul 2011)
+*kde-l10n-4.6.4-r1 (13 Jul 2011)
+*kde-l10n-4.6.3-r2 (13 Jul 2011)
+
+  13 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kde-l10n-4.6.3-r2.ebuild, +kde-l10n-4.6.4-r1.ebuild,
+  +kde-l10n-4.6.5-r1.ebuild:
+  Dont install kdepim files if they are included in the tarballs, bug 366353
 
 *kde-l10n-4.6.5 (09 Jul 2011)
 
diff --git a/kde-base/kde-l10n/Manifest b/kde-base/kde-l10n/Manifest
index 5835bcba9558..9bb3e27701bf 100644
--- a/kde-base/kde-l10n/Manifest
+++ b/kde-base/kde-l10n/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST kde-l10n-ar-4.6.3.tar.bz2 3077588 RMD160 83f13cb0c3ce407abb5bcff8bf400a007bc7dcf0 SHA1 a433fbfcde29131bca6a06fdcb6d44c748008927 SHA256 6fc25a94093fffcfde4f3805f612bb6aa7ac6858ff33cd9a15241f77e83d6c8b
 DIST kde-l10n-ar-4.6.4.tar.bz2 3079577 RMD160 3ba675f201ce719f84c8b2cdde45b4f6d66705fd SHA1 b1b5af5af3acb55ea42b413386cbd81c53d7797e SHA256 4d1842e5cf842a8039a8b489d8ea7177fa7f33dacbb8000524c6b4334a93aa3c
@@ -161,24 +161,27 @@ DIST kde-l10n-zh_TW-4.6.3.tar.bz2 2262527 RMD160 cd4c71eb1e5264edf804dd70684d719
 DIST kde-l10n-zh_TW-4.6.4.tar.bz2 2262838 RMD160 e609ddbd0c6c0327d424a73064f5c560335d385a SHA1 352c5db5af449935291e8f75031e82f13b3042ab SHA256 415e02a121ba4a3f9c162a3064a2bbf0f41799d5f26c74ccd14ecf45b223295b
 DIST kde-l10n-zh_TW-4.6.5.tar.bz2 2785581 RMD160 eec72fd60729e2ca607b472f269fa6ddfbb7ea3b SHA1 e4653f9dd7879f02c0f31384cc6fa3b0c3aae08d SHA256 b1a0efbfa10f1f29fd9577072b37716eb99a59fd8b7f0e8ef540adec0f2d0d3a
 EBUILD kde-l10n-4.6.3-r1.ebuild 2240 RMD160 89c5e178e6867236142cb14ffd3a88137a2507ed SHA1 d78291c0c5d241f4f8575e7c7736fb660c8b473e SHA256 d76966a645f3ca3deb6d3d5efe0ccf8192668bf99ebda3f4c8cdf34e42be5cfa
+EBUILD kde-l10n-4.6.3-r2.ebuild 2356 RMD160 31e4cb6d5a04e083a1bf39fe02bcd11e59e1cce8 SHA1 5fbfb2e27eb38fb7bfc5e31c346e892e39902b3d SHA256 c806d755f204547b37d1ce15c50a0c9f8be4259652adbb006c45a161a1542656
+EBUILD kde-l10n-4.6.4-r1.ebuild 2356 RMD160 901eb5c44b1df388b1148ed5f42c3d22e81c3389 SHA1 7743dbd1a1fb23474e08b8081ae9ab96b2591124 SHA256 cbe7b0bf2d05adbbce53971d9e5c8b26c6c0805945e786be15f0d43fa719f5b8
 EBUILD kde-l10n-4.6.4.ebuild 2240 RMD160 1f38984ab5acc17908517bc0ddc028b60f485a28 SHA1 8979cde4574797dfd355fde2f673e7af768e983b SHA256 24aa0372e2e98744866d7f1bdbea387b8c444bd2a10108c68140a121a07546be
+EBUILD kde-l10n-4.6.5-r1.ebuild 2356 RMD160 2dc1817e5d77a34827b8c107aee24bc6e49d8fb2 SHA1 d91e7b1f5a193cea512b79dfd5c285356fe43e4f SHA256 50f82a7c0a9b866a436280388f1175a1edf7351d2a6757bc21f8fbe1df6ce0ac
 EBUILD kde-l10n-4.6.5.ebuild 2240 RMD160 9c4f6c64ecff91dbb8da75d6c6bb47ee180e446d SHA1 68984aea50ef0906407cff6432a3bf8be5f39db6 SHA256 6dd374cbdd20cfed6b8ddc9b67bd362378be9beb953f9ad1483bf42e1fc5d2b5
-MISC ChangeLog 12398 RMD160 1ece0a7757f3a074d050d56254ce44104607c727 SHA1 cebfdab6d15d211f5d13e89b0d3f2146afa611e0 SHA256 0650ec1844b504774381d9e06d6aea27ded41eed18d6635a784b190fe1622fea
+MISC ChangeLog 12721 RMD160 0ffd11d5e9f7d7ad1ff13a825fc95d0ddc5a1c68 SHA1 c2e96b084981da438bd1e62544a2dd1d4e88a1a6 SHA256 ab9b3571d3bcff03462971fc1d2f8b085d07e18ece84be6547bb097f67d08f24
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOGHDZAAoJEOf+E+/4L5Lm03YP/R4o4qWRAJ3fyna/Pi3mUNSh
-0OrHyUuRID/v8pof4nVNNFXNVBVMQ4jJ1LffPhtYvoRhzRdNFvrafY2e6dd52dV6
-aAY3idwLsGkVpbjS4zmL9Gmd78cR3cj9pCd8xxLvRA5en5CzvOSQXeaJ6xtxmS3O
-DrWtpd4XZsi7rn6K+tyCZgMX0a5uVfh/3OggO/FooweyZpWGRJGelBrQFTmQxw9/
-DC5tlYsYQYRUXScxd08zMhxVq7tJomKvw4l7L5Qp+iJn19p0rBCkD9cKn5YjaKAC
-Ff9EaojGs5ugzvkRvnCauTE4hosPSzJbRE2JYslRghlkyeL+gbtjiqKVvXojvHh2
-6DqQMxIO61qDIuVPNNAYtnDxoZ3AuYJ3arR+mRVKMWQYYWx0JrjZH1OAWXaSURHK
-fYi7g57jvHVdDbhkvCwx49m/Hl7KzUdpkwCYZv99PIW8z3PnBYxIOIIJiR/CLBbj
-Se2T8BWt5XMdJJg1S6zCoZBbz+nQDJTnnO0xfkbPQH1rmZrsNU0VcJYF2/a6iBKD
-R7abQHAoBv2oGa0gv5w3yGX5fFZEb7gCsNQsnjjaWvZT8STYfaU9oMQUpYZR7rIh
-QPCAEpTStC/libwy7mnZJlcJEeRx3Wh4jbFOjEdgP7ePZWW9R8xkfyX7lUT00LOI
-pZ9vg9nfCRUFdMnSKwrC
-=eBjs
+iQIcBAEBCgAGBQJOHcUOAAoJEEb+UGWnxTyHIaMP/ju3EO81HUWBdqbGXIvF8hR3
+Y+nbl3C2FPQIw2T05MEJ0stv47bGEaT4Kca1eqZjvVGSlIEh1q339mj/NjD2E8qe
+GMhJMBcHnOXaQ3wSBAWiGTLQ9HrKeH9dVSEJ9lFfIzvJSvhtih+AKuu26x+Sukra
+fJKikY/VfArszy7VnfVPJQgJoRInOOie2GFDe74x1ZlX2BLEZFax0+lLBbd/EYxU
+n7lBEL4GZvCuz+DV5xK+91ovDrXdfUYnvc4l8rx2ZQp5xEfNhX2jGJJUT8udJrMC
+VgMl7eLGf6nGNRnXaT+HQSKjSMASCR1UtLsd5XdX251KbSFgfcGNuvb3LllGxZDV
+9ydVMFGkg5jh2iQL14tG7QxynUonyAC+e8XeakWQFJ5c6F6MsNSpbX0a4Q7hGAK4
+ECfoWYjBBEzPHFQtKk0lcj1+8DKORBnK2CDQ7z6wuyZyuJrb8fFl021PESJVzeHm
+lnkobr7xoTmihQgwrVPwv3jvnyw+qb0IIq3U3k8r3GBF/tdFAwMP81ftlsW/NT/C
+oogYb2hqqG0cF4c6W6/awQFIFUoqerHL8+0MjMCuZ4O4a08875szQZ4G1Kmx5r3g
+r5kVmetdLRKZMDJMY7iaBPG0jyy6/6/DjeoK2mP31NaQYf59cg+ST/7CkdmHAkhp
+T0AZVgweXIrBRBm+cnyl
+=EbnT
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kde-l10n/kde-l10n-4.6.3-r2.ebuild b/kde-base/kde-l10n/kde-l10n-4.6.3-r2.ebuild
new file mode 100644
index 000000000000..1b107a5a6dda
--- /dev/null
+++ b/kde-base/kde-l10n/kde-l10n-4.6.3-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.6.3-r2.ebuild,v 1.1 2011/07/13 16:17:04 dilfridge Exp $
+
+EAPI="3"
+
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="!<kde-misc/konq-plugins-4.6"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg ca ca@valencia cs da de el en_GB es et eu fi fr ga gl gu he hi
+hr hu ia id is it ja kk km kn ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sv th tr uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+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
+
+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
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# Upstream added kdepim-runtime translations by mistake and does not want to
+	# make a new tarball, bug 366353
+
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim-runtime):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim):# no kdepim:g' {} +
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-base/kde-l10n/kde-l10n-4.6.4-r1.ebuild b/kde-base/kde-l10n/kde-l10n-4.6.4-r1.ebuild
new file mode 100644
index 000000000000..6423a1001c3d
--- /dev/null
+++ b/kde-base/kde-l10n/kde-l10n-4.6.4-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.6.4-r1.ebuild,v 1.1 2011/07/13 16:17:04 dilfridge Exp $
+
+EAPI="3"
+
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="!<kde-misc/konq-plugins-4.6"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg ca ca@valencia cs da de el en_GB es et eu fi fr ga gl gu he hi
+hr hu ia id is it ja kk km kn ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sv th tr uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+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
+
+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
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# Upstream added kdepim-runtime translations by mistake and does not want to
+	# make a new tarball, bug 366353
+
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim-runtime):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim):# no kdepim:g' {} +
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}
diff --git a/kde-base/kde-l10n/kde-l10n-4.6.5-r1.ebuild b/kde-base/kde-l10n/kde-l10n-4.6.5-r1.ebuild
new file mode 100644
index 000000000000..e59cf25b6136
--- /dev/null
+++ b/kde-base/kde-l10n/kde-l10n-4.6.5-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-l10n/kde-l10n-4.6.5-r1.ebuild,v 1.1 2011/07/13 16:17:04 dilfridge Exp $
+
+EAPI="3"
+
+inherit kde4-base
+
+DESCRIPTION="KDE internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="!<kde-misc/konq-plugins-4.6"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+handbook"
+
+# /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.bz2::' -e 's:kde-l10n-::' |tr '\n' ' '
+MY_LANGS="ar bg ca ca@valencia cs da de el en_GB es et eu fi fr ga gl gu he hi
+hr hu ia id is it ja kk km kn ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru sk
+sl sr sv th tr uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+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
+
+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
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# add all linguas to cmake
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			DIR="${PN}-${LNG}-${PV}"
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# Upstream added kdepim-runtime translations by mistake and does not want to
+	# make a new tarball, bug 366353
+
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim-runtime):# no kdepim-runtime:g' {} +
+	find "${S}" -name CMakeLists.txt -type f \
+		-exec sed -i -e 's:add_subdirectory(kdepim):# no kdepim:g' {} +
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook docs)
+	)
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}