public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [Patch] review vdr-plugin-2.eclass changes
@ 2018-01-21 18:31 Joerg Bornkessel
  2018-01-21 21:48 ` Ulrich Mueller
  0 siblings, 1 reply; 2+ messages in thread
From: Joerg Bornkessel @ 2018-01-21 18:31 UTC (permalink / raw
  To: gentoo-dev


[-- Attachment #1.1.1: Type: text/plain, Size: 3064 bytes --]

Hallo,
as the LINGUAS Variable will be deprecated in the Future, i have the
vdr-plugin-2.eclass adapted to L10N handling.
Please review and comment...

<snipp>

Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2018/01/21)
--- vdr-plugin-2.eclass.orig    2017-02-28 20:50:50.000000000 +0100
+++ vdr-plugin-2.eclass 2018-01-21 19:06:12.000000000 +0100
@@ -284,26 +284,26 @@
    pofile_dir=( ${po_dir} ${po_subdir[*]} )
 }

-vdr_linguas_support() {
-#  Patching Makefile for linguas support.
-#  Only locales, enabled through the LINGUAS (make.conf) variable will be
+vdr_l10n_support() {
+#  Patching Makefile for L10N support.
+#  Only locales, enabled through the L10N (make.conf) variable will be
 #  compiled and installed.

-   einfo "Patching for Linguas support"
+   einfo "Patching for L10n support"
    einfo "available Languages for ${P} are:"

    vdr_detect_po_dir

    for f in ${pofile_dir[*]}; do
-       PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e
"s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-       einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
+       PLUGIN_L10N=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" |
cut -d_ -f1 | tr \\\012 ' ' )
+       einfo "L10N=\"${PLUGIN_L10N}\""

        sed -i ${f}/Makefile \
-           -e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach
dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
-           || die "sed failed for Linguas"
+           -e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach
dir,\$(L10N),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
+           || die "sed failed for L10N"
    done

-   strip-linguas ${PLUGIN_LINGUAS} en
+   strip-linguas ${PLUGIN_L10N} en
 }

 vdr_i18n() {
@@ -439,10 +439,10 @@
    while [ "$1" ]; do
        case "$1" in
        all)
-           vdr-plugin-2_src_util unpack add_local_patch patchmakefile
linguas_patch i18n
+           vdr-plugin-2_src_util unpack add_local_patch patchmakefile
l10n_patch i18n
            ;;
        prepare)
-           vdr-plugin-2_src_util add_local_patch patchmakefile
linguas_patch i18n
+           vdr-plugin-2_src_util add_local_patch patchmakefile
l10n_patch i18n
            ;;
        unpack)
            unpacker_src_unpack
@@ -462,8 +462,8 @@
        i18n)
            vdr_i18n
            ;;
-       linguas_patch)
-           vdr_linguas_support
+       l10n_patch)
+           vdr_l10n_support
            ;;
        esac

@@ -581,10 +581,10 @@
        einfo "Installing locales"
        cd "${TMP_LOCALE_DIR}" || die "could not change to TMP_LOCALE_DIR"

-       local linguas
-       for linguas in ${LINGUAS[*]}; do
+       local l10n
+       for l10n in ${L10N[*]}; do
        insinto "${LOCDIR}"
-       cp -r --parents ${linguas}* ${D}/${LOCDIR}
+       cp -r --parents ${l10n}* ${D}/${LOCDIR}
        done
    fi

</snapp>

Regards

Joerg

-- 
Joerg Bornkessel <hd_brummy@gentoo.org>
GnuPG Key: 0x93EB5F4DAA5832A1
Fingerprint: 0E0A A1EE 1DF4 41D7 A3F5  21C2 93EB 5F4D AA58 32A1

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: vdr-plugin-2.eclass.patch --]
[-- Type: text/x-patch; name="vdr-plugin-2.eclass.patch", Size: 2382 bytes --]

--- vdr-plugin-2.eclass.orig	2017-02-28 20:50:50.000000000 +0100
+++ vdr-plugin-2.eclass	2018-01-21 19:06:12.000000000 +0100
@@ -284,26 +284,26 @@
 	pofile_dir=( ${po_dir} ${po_subdir[*]} )
 }
 
-vdr_linguas_support() {
-#	Patching Makefile for linguas support.
-#	Only locales, enabled through the LINGUAS (make.conf) variable will be
+vdr_l10n_support() {
+#	Patching Makefile for L10N support.
+#	Only locales, enabled through the L10N (make.conf) variable will be
 #	compiled and installed.
 
-	einfo "Patching for Linguas support"
+	einfo "Patching for L10n support"
 	einfo "available Languages for ${P} are:"
 
 	vdr_detect_po_dir
 
 	for f in ${pofile_dir[*]}; do
-		PLUGIN_LINGUAS=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-		einfo "LINGUAS=\"${PLUGIN_LINGUAS}\""
+		PLUGIN_L10N=$( ls ${f}/po --ignore="*.pot" | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+		einfo "L10N=\"${PLUGIN_L10N}\""
 
 		sed -i ${f}/Makefile \
-			-e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(LINGUAS),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
-			|| die "sed failed for Linguas"
+			-e 's:\$(wildcard[[:space:]]*\$(PODIR)/\*.po):\$(foreach dir,\$(L10N),\$(wildcard \$(PODIR)\/\$(dir)\*.po)):' \
+			|| die "sed failed for L10N"
 	done
 
-	strip-linguas ${PLUGIN_LINGUAS} en
+	strip-linguas ${PLUGIN_L10N} en
 }
 
 vdr_i18n() {
@@ -439,10 +439,10 @@
 	while [ "$1" ]; do
 		case "$1" in
 		all)
-			vdr-plugin-2_src_util unpack add_local_patch patchmakefile linguas_patch i18n
+			vdr-plugin-2_src_util unpack add_local_patch patchmakefile l10n_patch i18n
 			;;
 		prepare)
-			vdr-plugin-2_src_util add_local_patch patchmakefile linguas_patch i18n
+			vdr-plugin-2_src_util add_local_patch patchmakefile l10n_patch i18n
 			;;
 		unpack)
 			unpacker_src_unpack
@@ -462,8 +462,8 @@
 		i18n)
 			vdr_i18n
 			;;
-		linguas_patch)
-			vdr_linguas_support
+		l10n_patch)
+			vdr_l10n_support
 			;;
 		esac
 
@@ -581,10 +581,10 @@
 		einfo "Installing locales"
 		cd "${TMP_LOCALE_DIR}" || die "could not change to TMP_LOCALE_DIR"
 
-		local linguas
-		for linguas in ${LINGUAS[*]}; do
+		local l10n
+		for l10n in ${L10N[*]}; do
 		insinto "${LOCDIR}"
-		cp -r --parents ${linguas}* ${D}/${LOCDIR}
+		cp -r --parents ${l10n}* ${D}/${LOCDIR}
 		done
 	fi
 

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 1045 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [gentoo-dev] [Patch] review vdr-plugin-2.eclass changes
  2018-01-21 18:31 [gentoo-dev] [Patch] review vdr-plugin-2.eclass changes Joerg Bornkessel
@ 2018-01-21 21:48 ` Ulrich Mueller
  0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller @ 2018-01-21 21:48 UTC (permalink / raw
  To: gentoo-dev

[-- Attachment #1: Type: text/plain, Size: 552 bytes --]

>>>>> On Sun, 21 Jan 2018, Joerg Bornkessel wrote:

> as the LINGUAS Variable will be deprecated in the Future, i have the
> vdr-plugin-2.eclass adapted to L10N handling.
> Please review and comment...

AFAICS this is about *.po files, therefore gettext related. The eclass
should _not_ be changed to L10N then, but stay with LINGUAS.

Also the LINGUAS variable won't be deprecated, but will retain
standard gettext behaviour. The only change is that it will no longer
be expanded into linguas_* USE flags (which shouldn't affect your
eclass).

Ulrich

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-21 21:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-21 18:31 [gentoo-dev] [Patch] review vdr-plugin-2.eclass changes Joerg Bornkessel
2018-01-21 21:48 ` Ulrich Mueller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox