From a9c8cdec1149a7fc1c815d401e6133e45a0f42c8 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 10 Jul 2010 15:52:14 +0000 Subject: [PATCH] Remove share/opera/package. Use O_ instead of MY_ variable prefix. Move opera_linguas function to src_prepare(). Remove unneeded quoting. Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- www-client/opera/ChangeLog | 6 ++- www-client/opera/Manifest | 4 +- www-client/opera/opera-10.70_pre6396.ebuild | 50 ++++++++++----------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog index d6e806d4b2dd..217789fc40dd 100644 --- a/www-client/opera/ChangeLog +++ b/www-client/opera/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/opera # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.518 2010/07/10 14:29:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.519 2010/07/10 15:52:14 jer Exp $ + + 10 Jul 2010; Jeroen Roovers opera-10.70_pre6396.ebuild: + Remove share/opera/package. Use O_ instead of MY_ variable prefix. Move + opera_linguas function to src_prepare(). Remove unneeded quoting. *opera-10.70_pre6396 (10 Jul 2010) diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest index f2b781a19107..cc16be7cdaca 100644 --- a/www-client/opera/Manifest +++ b/www-client/opera/Manifest @@ -23,6 +23,6 @@ EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 S EBUILD opera-10.60-r1.ebuild 5116 RMD160 a2db2551d8231759b16c68d8b987dbb4b9d67105 SHA1 4d5dfd6568e98f345c62bf5c128b5f4dbfcdfaca SHA256 b4a9495b48e6fa1ba17f7e8ebf3a8a331f8ac7c9aa23c2d9e30406ba49a1df10 EBUILD opera-10.60.ebuild 4884 RMD160 a3125d90cf4bdd16bd80ef36b14eff6a643046bf SHA1 2687a180ea3c9d1c5cbe90815e4a95d0c0cb6d17 SHA256 9b597ed777844ef7c980592d0f8cf703f455cd302620a9c42d6b91f46569173f EBUILD opera-10.70_pre6395.ebuild 5058 RMD160 7e66ac013104dab2576c8d406fd6d2b9d0a7dd8f SHA1 8c94c2b4554f89ea60afdc26baf80b1aa254aff0 SHA256 6ea0df548d871838e331fda6c6e146885b5dac02374d5d413bbb6a4f04dff07c -EBUILD opera-10.70_pre6396.ebuild 5055 RMD160 8d20aad20a67e6b38efe5f79ae7baa22090b8aa0 SHA1 56a4825f5636e45df61ea914fc22fdef7fb62b64 SHA256 f3548a9e5ad8fee554a2958349bea0554d5a12a42991c41c8bd5021e20efbd46 -MISC ChangeLog 99847 RMD160 e940cf8d81c5f2a691c5986ef319601923bfb9d7 SHA1 a6d292e1f5dc9e247cc3dee2e737185e673013d2 SHA256 bb0f6e322997ad23fef19fa02b9161805694469ed76553655eba0772a506fb11 +EBUILD opera-10.70_pre6396.ebuild 4998 RMD160 f4acacb2ed802f4e5b4be0603ce9a65586b21c5c SHA1 599561383500e87a21d3c686c80dc31f11e3c973 SHA256 687ffedcda4ff857346f46ac3bef93476ed45782be5cba67cffcbc2e59b2ce44 +MISC ChangeLog 100065 RMD160 b9cabbf8453e8618768a1f6402693672ab8933fa SHA1 2bc61f3061f2a5e3ae0bfbb3ee44bebf4a827a9f SHA256 aa3556d34d878bdbc78dd1505bba1f8ecdb9df27991094995f4c5d2872e1663e MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a diff --git a/www-client/opera/opera-10.70_pre6396.ebuild b/www-client/opera/opera-10.70_pre6396.ebuild index c717f32cffe0..9c2fcfc36393 100644 --- a/www-client/opera/opera-10.70_pre6396.ebuild +++ b/www-client/opera/opera-10.70_pre6396.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre6396.ebuild,v 1.1 2010/07/10 14:29:38 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.70_pre6396.ebuild,v 1.2 2010/07/10 15:52:14 jer Exp $ EAPI="2" @@ -21,14 +21,14 @@ OPREFIX="/usr/$(get_libdir)" QA_DT_HASH="${OPREFIX}/${PN}/.*" QA_PRESTRIPPED="${OPREFIX}/${PN}/.*" -MY_LINGUAS=" +O_LINGUAS=" be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk vi zh-CN zh-HK zh-TW " -for MY_LINGUA in ${MY_LINGUAS}; do - IUSE="${IUSE} linguas_${MY_LINGUA/-/_}" +for O_LINGUA in ${O_LINGUAS}; do + IUSE="${IUSE} linguas_${O_LINGUA/-/_}" done O_V="${PV/_pre/-}" @@ -82,19 +82,6 @@ RDEPEND=" x11-libs/xcb-util " -opera_linguas() { - # Remove unwanted LINGUAS: - local LINGUA - local LNGDIR="share/${PN}/locale" - einfo "Keeping these locales: ${LINGUAS}." - for LINGUA in ${MY_LINGUAS}; do - if ! use linguas_${LINGUA/-/_}; then - LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) - rm -r "${LINGUA}" - fi - done -} - pkg_setup() { echo -e \ " ${GOOD}****************************************************${NORMAL}" @@ -116,7 +103,10 @@ src_unpack() { src_prepare() { # Remove "license directory" (bug #315473) - rm -rf "share/doc/opera" + rm -rf share/doc/opera + + # Remove package directory + rm -rf share/opera/package # Leave libopera*.so only if the user chooses if ! use gtk; then @@ -141,19 +131,27 @@ src_prepare() { share/applications/opera-widget-manager.desktop \ || die "sed failed" - # Sed libdir in opera script - sed "${FILESDIR}"/opera \ + # Fix libdir in opera script + sed \ + "${FILESDIR}"/opera \ -e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \ || die "sed opera script failed" - # Sed libdir in defaults/pluginpath.ini + # Fix libdir in defaults/pluginpath.ini sed -i \ - -e "s|/usr/lib32|${OPREFIX}|g" \ share/opera/defaults/pluginpath.ini \ + -e "s|/usr/lib32|${OPREFIX}|g" \ || die "sed pluginpath.ini failed" - # Remove linguas only when the user sets no linguas - [[ -z MY_LINGUAS ]] || opera_linguas + # Remove unwanted linguas + LNGDIR="share/${PN}/locale" + einfo "Keeping these locales (linguas): ${LINGUAS}." + for LINGUA in ${O_LINGUAS}; do + if ! use linguas_${LINGUA/-/_}; then + LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) + rm -r "${LINGUA}" + fi + done # Change libz.so.3 to libz.so.1 for gentoo/freebsd if use elibc_FreeBSD; then @@ -164,7 +162,9 @@ src_prepare() { export SANITY_CHECK_LIBZ_FAILED=1 break fi - sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i" + sed -i \ + "$i" \ + -e 's/libz\.so\.3/libz.so.1/g' done [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1" fi -- 2.26.2