Fix command-not-found msgs. Thanks to Nikoli.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 23 insertions, 36 deletions

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index fac3faa3c9c9..673f588af77d 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice-l10n
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.47 2012/05/31 10:08:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.48 2012/06/01 06:16:11 scarabeus Exp $
+
+  01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-l10n-3.5.4.ebuild:
+  Fix command-not-found msgs. Thanks to Nikoli.
 
   31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Silence repoman wrt local desc in metadata.
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 9f1f256832fc..7be8cbdc7b0c 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -164,23 +164,23 @@ DIST LibO_3.5.4_Linux_x86_langpack-rpm_xh.tar.gz 1672153 RMD160 573c40cc7f43a344
 DIST LibO_3.5.4_Linux_x86_langpack-rpm_zh-CN.tar.gz 1714629 RMD160 556aef3dbba39ae6b5c7bebeaafa207b086f0d2f SHA1 30758a5f49f3bbd1be7e57b2d485adad1f0e5fcc SHA256 9ab358828d96920bc13a480f63004b5ebbb79ff14f770903b505064ff7e21e13
 DIST LibO_3.5.4_Linux_x86_langpack-rpm_zh-TW.tar.gz 1705716 RMD160 ded4899c92db0d3a457c189c1c330cc5bad5b44d SHA1 e0ffe22435299d979880932d35b6bcda5e5820e4 SHA256 b3c0dcd4e5118325c9e54c28382035c269bde5c85e6cda82a1c58a812993ca9d
 DIST LibO_3.5.4_Linux_x86_langpack-rpm_zu.tar.gz 1668099 RMD160 22b351f5a312e38e38ad005700f58aa50fcd43cf SHA1 81c25d9658ac5c6152d548df24e663463d72b18c SHA256 f6d1c9b905a2251ef8a1422e57f50df68ddd8f1ef760f599ef7955f140fb9a02
-EBUILD libreoffice-l10n-3.5.4.ebuild 3718 RMD160 f0657fb9e99473ea0e0a1602c41d9f84efc2b984 SHA1 38ccde06274c373a5bd7ee98be773e9efcd586eb SHA256 6a2c9f244ac94750e488f57753bf32d8b7d0212ca06f95886f167d9185a40dcc
-MISC ChangeLog 8653 RMD160 a9f879b5e118df2b0b83004777c4decf239b2d4a SHA1 97d3c9fd469f8f15d3f95f8058723b957ec5a615 SHA256 593451e473eccdfd44a456bf009990c1405b8dffb4f11c7fb27900d909b92901
+EBUILD libreoffice-l10n-3.5.4.ebuild 3444 RMD160 a135f322b681a0456b63351dff232dbdb327db8f SHA1 7863c1a313f6ae64ca8c0a33fd4bf9c59c9ced4f SHA256 2d061e4e8a5a1a83e410c5e3206be43624a3413168569814c60b43e3d9523228
+MISC ChangeLog 8790 RMD160 9fb51eca9f052ce2031a5fa7d0fb3041957831cd SHA1 3bd1761c70083a14a593584752efc38c379d56f8 SHA256 f61f213781b706b7845e3c961ac7b9e0c1cfa065cb21c6d91237a56d16a72e9e
 MISC metadata.xml 278 RMD160 0aea82f8be4662f68dce8174739945968e8cdd38 SHA1 7ce8e89f0d17e893efed6ed2ae57e8acb6912169 SHA256 bf7d17698dee3978ba79d4d84e6b414f1933c11af350b6d06ad5b6cbc2cb7608
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPx0MqAAoJEOSiRoyO7jvoFl8P/AtFVUjViyOwDx/zKsapxoS5
-BzpbW9Pw7jxN1lXkXvdxha4ntU3wGCUQhvqE6ply+hKrgbWTGdIDSGN2yyLEeIDz
-gnKuH/mNtRAXg8m+SndwRj707c5UxlZPAAlC8xnt/uygLHQUsiUeNOPy+q3aVxSi
-Z4D4bb/KuE3CuRNY1fjwKs2waTDASNoOs1zwD1sgtpB9VqNCsjOpEav5YNvhYhMS
-WxSZyOoWZECwF5RiaHkCFqzhWRTD6O46V8HPH1AmqQQQ+STajas2Oqw0kvyyx1sp
-mo7ET4bU9vDhC6EHZcsRIN8zKwdo+mpJoaug1CZtlc4QIDHuLkGuM/M58EB9pFNu
-HrY86iWSX3ZNEWirxQ5+1aPkTEkcuMHvqr5JySiuefBQM6swjw9uiMXnAnm+2rtA
-MQq7zWjSGqvJF/WZcCfif94x7xSWCzfP8sEbvL2dYejxFJCDft8t2PSizNKx79v5
-ETlthq1vDz4rPOeojao98L0K7G4Zi2pblrF3GRqS5UVXTouGS4v4XqkyxNEBqJwd
-hRJscmJZy862Cnyr91H84w+3//5t5pvdBqXe5Zlw7BxhB4CPsDTZS17BxJ4Q3xM5
-68/NdY3pcmtznZ0rCpnGA4WGxiEUEOYYm+gfowsl7o3KpsSep4sQx7HuRH7Kv8V2
-t49QNOpbGVuVGaiyinCV
-=TDeg
+iQIcBAEBAgAGBQJPyF4xAAoJEOSiRoyO7jvoiioQAK4VEUa5S/Qj8oxZxTnHMO4y
+FGoMxNNJoM0vTPgj0wYgmd1wzvVNT+vy/0P/bHazQkN2TDBpyqXHZZ0UOEO/Mmor
+nc7KUff7K4Mn2h9qMBm+Cu31eygniTFEcRN7L2xjed69OBZDprimeVy16/1jss6F
+8Zy/vdGY0rX7AXN7L4Jk1e8yDN2CVePVOREaTT7XGuM20rwHjE9aqFVGcEbcDmG+
+N4MU3Ae8d2MBhgfC5a+CCoRpyhU5VJRY4zDvzcS1Z6qeOXf1SfDrEmuaKjaNBtfV
+XArHSEQkU7Wd3Fy+h9mMxICV1xufsMStxhyUVQnKQTUXQfgiqYzI/waVQ13tkSIy
+lpsaR3ADMPBOnzW6CXi0MyRE+qB8jyURMBdxP794pg75lXSyGih8r5Ul1+ryoT7n
+eccHh3ghzT63szpFsxbhBXMDrbzRgNmMkFmIv60rdkir75nThqNo1Nbb57W1LXPS
+PFamlhsLuL6sfZgzpqJybXDWAmLA10BOG7ZcOlq4LGMEwc8y3Fdm+qj92LkBw5Dl
+Xg3Iw2e1wGQVJse+ViIMhkl+VNnu64hWF3MyYQFu8Bc9fZ3hap2z2632zZ9lPChJ
+nffxdyVljqWmOGIxc8LOPFVYQYX+eYcpAO80FknPSYbcabNaaCic9JTRJtcpulkJ
+kHd3DJvmVcAq5ayhLHbA
+=ztNz
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
index 7182c36d0c46..9b6a00a3b88a 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.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/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.3 2012/05/31 10:07:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.4 2012/06/01 06:16:11 scarabeus Exp $
 
 EAPI=4
 
@@ -52,13 +52,10 @@ done
 RDEPEND="${SPELL_DICTS_DEPEND}"
 unset X SPELL_DICTS SPELL_DICTS_DEPEND
 
-# blockers for old libreoffice with bundled linguas
 RDEPEND+="
-	!=app-office/libreoffice-3.4.9999-r1
-	!=app-office/libreoffice-9999-r1
 	|| (
-		>=app-office/libreoffice-3.4.4.2-r1
-		>=app-office/libreoffice-bin-3.4.4.2-r1
+		>=app-office/libreoffice-$(get_version_component_range 1-2 ${MY_PV})
+		>=app-office/libreoffice-bin-$(get_version_component_range 1-2 ${MY_PV})
 	)
 "
 
@@ -93,10 +90,6 @@ src_unpack() {
 			rpm_unpack ./"${rpmdir}/"*.rpm
 		fi
 	done
-	OO_EXTENSIONS=()
-	for i in ${ooextused[@]}; do
-		OO_EXTENSIONS+=( ${i} )
-	done
 }
 
 src_prepare() { :; }
@@ -113,14 +106,4 @@ src_install() {
 	fi
 	# remove extensions that are in the l10n for some weird reason
 	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
-
-	echo "${OO_EXTENSIONS[@]}"
-	office-ext_src_install
-}
-
-pkg_postinst() {
-	office-ext_pkg_postinst
-}
-pkg_prerm() {
-	office-ext_pkg_prerm
 }