From 0f1dc7a2d0e109eb1cc08ed72b25255df15dc22b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sat, 29 Nov 2014 19:02:09 +0000 Subject: [PATCH] Revert changes to stable ebuild by monsieurp and put them in a revision bump instead. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C! --- app-text/po4a/ChangeLog | 9 ++++- app-text/po4a/Manifest | 27 ++++++++++++- app-text/po4a/po4a-0.45-r1.ebuild | 33 +--------------- app-text/po4a/po4a-0.45-r2.ebuild | 64 +++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 34 deletions(-) create mode 100644 app-text/po4a/po4a-0.45-r2.ebuild diff --git a/app-text/po4a/ChangeLog b/app-text/po4a/ChangeLog index 6a2bc1ea174f..a4f1b1608078 100644 --- a/app-text/po4a/ChangeLog +++ b/app-text/po4a/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/po4a # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.85 2014/11/29 18:06:14 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/ChangeLog,v 1.86 2014/11/29 19:02:05 dilfridge Exp $ + +*po4a-0.45-r2 (29 Nov 2014) + + 29 Nov 2014; Andreas K. Huettel po4a-0.45-r1.ebuild, + +po4a-0.45-r2.ebuild: + Revert changes to stable ebuild by monsieurp and put them in a revision bump + instead. 29 Nov 2014; Patrice Clement po4a-0.45-r1.ebuild: Honour languages set by LINGUAS. Bug #402691. diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest index d3f295354bae..79bec4d5c920 100644 --- a/app-text/po4a/Manifest +++ b/app-text/po4a/Manifest @@ -1,6 +1,29 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 0.41-po4a-build.patch 589 SHA256 1ad6b20cf5306bc19a1d9509094a3ec9313f1570228d9675133595fb1690769e SHA512 d7e38fc7e2212291158dd4fa9219df92261e5d1880b004220aad4a66caf8e33a2ac77bc7606e832ac9b75fdc2646a38a7d5d2395dca9f928d389ca2a0ce154c1 WHIRLPOOL ab0c6fd3246f69560ea8617bf4ce5d2e0192cc55f9805f94fe2f602f92b8e6603cdedb592126e0cc189a8336bccd2938fe4e5be337d1098ed8325c88a1a634a0 AUX compare-po.pl 787 SHA256 6111bffd2dc6cd7411df82387ecbfa8b3efdc46b90e3571560a770f876fb51d0 SHA512 65b0d97af8e736a6a05f9f9ae3c84019b0e2d12719bec1286c55fc9f39ad38d15f3c0d4c6aa25808fe8b4038cd0ed71d6a66e6d5fdeaf76938021a4a38d549dc WHIRLPOOL cda37c33fc2f03fba8bf296bd2d97a3b49307ea1669e77d5d32a7c964b7192e1ba0529f11d37f38366aa937dfa3578caf253339334011c15413e36abd92c58a2 DIST po4a_0.45.orig.tar.gz 2208959 SHA256 f5f47db85b48893d87d921152c96082233975bd0e0a9ee14f58c07d7dff81678 SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f WHIRLPOOL 404bb45412fff4cec13304490e5f74ee4a4573d3c755491816cfe501c3e83dbdb58ae3c799516fe21c692c9de6fbc2dd5a261c8039eca2e2777365b27ac358cd -EBUILD po4a-0.45-r1.ebuild 2025 SHA256 e2b165142095941e3567fd7d59d6c11483d6cca5a4e9d5267a3238bfd8c458f9 SHA512 5ed3ae8276aa81499c14dcd13b2ff67305af53158f0655cd1b8995179dde772728f1be4dd1b9f94396bfd6a68fcaf1f5d0ad222d43f7d74feeb4cfdf25188093 WHIRLPOOL afa1b5c39a03bb28096bb4ccf7aa528207feb8d34922feab5d18e941ac97cdd18e3fc15ffc867cc19febe0a4c156ee1f6d2ff8ac8c6356b08ae4eb5e97a6b53f -MISC ChangeLog 10650 SHA256 5cfc8eb629b154bdaa951fb78dfc6f0559d9cd72f68f23b75147159f427219a3 SHA512 7c18216a9bad12e4837ea2e5ed058e75af40f3ea62cb38390c172318b2cc25080626469f781bfd7548dc4e03e927d559fb43793fd5c7ce98d7406094e363339e WHIRLPOOL b09a17bdf8c6b18846eb57f3723d88dc0b9532468192fa01a03e1a7470e97e5a050162e8768ea9bde25fe69db679f7633da2f9e93b6a42fc0ea3d8c962d650e6 +EBUILD po4a-0.45-r1.ebuild 1103 SHA256 60e6fdd2b67e89f2c1efa0d75f28b9fe7eb9dc4f1bebf2075735b2bbcbcf92fc SHA512 f3194a6def13215cfb2188cc1382e49a49ad9e61131fb916d59c45dccedf7166e1a30228d8582785fb363e316b6d56c8a4356435baa6784152be76176ee80b24 WHIRLPOOL f55f5c3c7b0eef0a3c9ebde38f8adf9ab3e1596751d5b8512eeb80db06641c78b81f08a87caf5a12ee6a8a9a2676b8c69dd5b6f608d56eb1b2deaf01c78d47c3 +EBUILD po4a-0.45-r2.ebuild 2037 SHA256 9ec844cdb7e103c9d52ebc9773dc53979a60df51accb294a926524d737c56d5f SHA512 3342339485b783dda6e882727daabd7565463306c754fb4e81cdafa10c54b707dd3e4fc2efd12128a7f9a8659a093ad0f6b5983011bc63ff11f0eb48396f05fc WHIRLPOOL 6453e951935a2c86d3eae65e2c48cdc29585cc3309eee0594feb785527f53a3ac842e8243fe3b18e0f39d5bd58f8505e1a29898b534c335262d082479fc61c9e +MISC ChangeLog 10872 SHA256 4a97260cfc1c95feda22ebf5a7d48420265e54bbaa1da3d161e8ebc710615fc7 SHA512 43199b4ec664335482e0384ec98bbfb6f13790a3e6f5c156c157b9a0860d680640f33600558c8900cbad21a0237e7f6fbf7551a0901deba91ace18a54377dfff WHIRLPOOL 2cc37962d0bf559461266a84332d81e97639b2dba7eba5335c8285318f8d3f77ac2188cde065e1145bf3d195517411c6f48ae8bcbbf94e3b81dfc77c09db0298 MISC metadata.xml 157 SHA256 6a11fd41a2a210a9760849de398ef8c62cf46cc742d09b2e1781def7848fa1ec SHA512 95158d74d42674de03bc271c8dffa2264759c77681436de71fa9b3ad67f50b09394b0401e6df6dde526bc8dcd6ea666ed6767662bd63c3e92cb33b7b23e4ede8 WHIRLPOOL d3fdf14c384070120719ad4076cd04630790564f5bceda2a273e6481ea27a6fc6291e55d78cbf8bf99b73c7b42e8a1f286927c990702dceee97a63815cb33846 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJUehguXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcnDgQAIUibnrdxM9b3NLYtxe2kOqS +xaZElBKhj6XqpYw/XVxCB8GQMoO8G8FOqTGKOV2Kb21aR2HTTrmf3+T+ua0BmV8a +9bOi5X5Mdc4kRbWub97NaUFYkhU2NXz95HXurLi0+085mynQWSyzPryo7dlYIrrN +pru1WI2wmZsP9CUIX+UhOvsJ0JvOoIRlXFc2Cf+vIsBJTKEHgwHwg0962/cNxwuC +eSFflNzLDyXbGbTLPqfXY9FlVO5T2jKo/BbWRyh5rloA4v2tsVds5h8C7dUBUa2n +TdN1s8MoqioWMB3ZE5HtpgpdYfhtuSVmj5T4wkelwiCzauUp5z3olCmTJdGpJgZS +MZEBQCRu3p7HxfekIRH8PjzhRsp/u8/cuq85IFI2PRdu157TA9sOsDDLuR+YZGKW +ZVt1tOaeBDl7/qgaXOxetqcJnHtp2jkWWdYJdgsVkMyo8YXNbNJSFQR+jUY0RO9o +8OnRqzjvgYqRmOSjWnQtcjDLarhJOhE4dAbJjdq8/8EfBO1G1b4Nm3OyRR0lgy87 +d9F/aeaRdtMFEAwmTr20xXLit5NdNG4EqK/VGgoHBomLgjGoKUBJ854CLVZPbD1A +9P+z+5nqHh/MfEiVp6l37xU2Jj78HzbnolJQrvygBjctShHnajlt/YDGgF1PJkuT +DhmpS5lBN+QfhPMsxOU8 +=Px6m +-----END PGP SIGNATURE----- diff --git a/app-text/po4a/po4a-0.45-r1.ebuild b/app-text/po4a/po4a-0.45-r1.ebuild index 65ce6f590aed..2764ca51407e 100644 --- a/app-text/po4a/po4a-0.45-r1.ebuild +++ b/app-text/po4a/po4a-0.45-r1.ebuild @@ -1,15 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.45-r1.ebuild,v 1.3 2014/11/29 18:06:14 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.45-r1.ebuild,v 1.4 2014/11/29 19:02:05 dilfridge Exp $ EAPI=5 -PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK" -PLOCALES_BACKUP="en" - # Needed because this package also installs to vendor_perl GENTOO_DEPEND_ON_PERL_SUBSLOT="yes" -inherit perl-app perl-module l10n +inherit perl-app DESCRIPTION="Tools for helping translation of documentation" HOMEPAGE="http://po4a.alioth.debian.org" @@ -36,29 +33,3 @@ DEPEND="${RDEPEND} virtual/tex-base )" SRC_TEST="do" - -src_prepare() { - # Check against locale files in ${S}/pod/bin for mismatches - # with languages listed in PLOCALES - local locales_path="$S/po/bin" - l10n_find_plocales_changes "$locales_path" "" ".po" - - # Array containing locale files to remove - local locales_to_remove=( ) - - # Get rid of disabled locales - my_get_disabled_locales() { - local locale=$1 - local locale_abs_path="$locales_path/$locale.po" - locales_to_remove+=$locale_abs_path - } - - l10n_for_each_disabled_locale_do my_get_disabled_locales - - einfo "Your LINGUAS lists the following languages: $LINGUAS" - einfo "Removing locale files not listed in it ..." - - # perl_rm_files also updates the Manifest file - # and therefore silences Perl as to .po files we're about to clean - perl_rm_files "${locales_to_remove[@]}" -} diff --git a/app-text/po4a/po4a-0.45-r2.ebuild b/app-text/po4a/po4a-0.45-r2.ebuild new file mode 100644 index 000000000000..fb4a1cac615f --- /dev/null +++ b/app-text/po4a/po4a-0.45-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/po4a/po4a-0.45-r2.ebuild,v 1.1 2014/11/29 19:02:05 dilfridge Exp $ + +EAPI=5 + +PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK" +PLOCALES_BACKUP="en" + +# Needed because this package also installs to vendor_perl +GENTOO_DEPEND_ON_PERL_SUBSLOT="yes" +inherit perl-app perl-module l10n + +DESCRIPTION="Tools for helping translation of documentation" +HOMEPAGE="http://po4a.alioth.debian.org" +SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="test" + +RDEPEND="dev-perl/SGMLSpm + >=sys-devel/gettext-0.13 + app-text/openjade + dev-libs/libxslt + dev-perl/Locale-gettext + dev-perl/TermReadKey + dev-perl/Text-WrapI18N" +DEPEND="${RDEPEND} + >=virtual/perl-Module-Build-0.380.0 + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.1.2 + test? ( app-text/docbook-sgml-dtd + app-text/docbook-sgml-utils + virtual/tex-base )" + +SRC_TEST="do" + +src_prepare() { + # Check against locale files in ${S}/pod/bin for mismatches + # with languages listed in PLOCALES + local locales_path="$S/po/bin" + l10n_find_plocales_changes "$locales_path" "" ".po" + + # Array containing locale files to remove + local locales_to_remove=( ) + + # Get rid of disabled locales + my_get_disabled_locales() { + local locale=$1 + local locale_abs_path="$locales_path/$locale.po" + locales_to_remove+=$locale_abs_path + } + + l10n_for_each_disabled_locale_do my_get_disabled_locales + + einfo "Your LINGUAS lists the following languages: $LINGUAS" + einfo "Removing locale files not listed in it ..." + + # perl_rm_files also updates the Manifest file + # and therefore silences Perl as to .po files we're about to clean + perl_rm_files "${locales_to_remove[@]}" +} -- 2.26.2