Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intltool/files/, dev-util/intltool/
Date: Tue, 27 Jun 2017 22:56:34
Message-Id: 1498604161.1a0088dc98a2c556852ecd9b6284174893efae0b.dilfridge@gentoo
1 commit: 1a0088dc98a2c556852ecd9b6284174893efae0b
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 27 22:56:01 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 27 22:56:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0088dc
7
8 dev-util/intltool: Remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 dev-util/intltool/Manifest | 1 -
13 .../files/intltool-0.50.2-localedir-fix.patch | 70 ----------------------
14 dev-util/intltool/intltool-0.50.2-r1.ebuild | 32 ----------
15 dev-util/intltool/intltool-0.51.0.ebuild | 29 ---------
16 4 files changed, 132 deletions(-)
17
18 diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
19 index 7e9e239e98e..2dfc13a3855 100644
20 --- a/dev-util/intltool/Manifest
21 +++ b/dev-util/intltool/Manifest
22 @@ -1,2 +1 @@
23 -DIST intltool-0.50.2.tar.gz 189483 SHA256 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 SHA512 9f7f0746e77a1a6765b49e16f65438103bc031f3fa8cac42c061deade4291703b95aa336eba2500c8f05d19e35620cf01a120c71a7b6816c1bfecbb9fd747b11 WHIRLPOOL b026ab99921aaddb376823f1eb06e7d669bcc0a3cfb12431676e4e041343a370d7f715d39d60ef991e86e4f8441228713fc82a7ecb3cae2dc3273f7f01ce66a3
24 DIST intltool-0.51.0.tar.gz 162286 SHA256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf WHIRLPOOL f0cf9a23c7f7dd9d4ec504709c447de1895bf5bdb10fe2000f9ebc8d93b0be204bb4bc1a54a1c3e981a9f8754cc354224e8411711e4996fc7ffd56335cb300cd
25
26 diff --git a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch b/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
27 deleted file mode 100644
28 index a887c41d3b5..00000000000
29 --- a/dev-util/intltool/files/intltool-0.50.2-localedir-fix.patch
30 +++ /dev/null
31 @@ -1,70 +0,0 @@
32 -=== modified file 'Makefile.in.in'
33 ---- Makefile.in.in 2013-05-12 18:38:08 +0000
34 -+++ Makefile.in.in 2013-05-22 13:43:26 +0000
35 -@@ -33,8 +33,7 @@
36 - datadir = @datadir@
37 - datarootdir = @datarootdir@
38 - libdir = @libdir@
39 --DATADIRNAME = @DATADIRNAME@
40 --itlocaledir = $(prefix)/$(DATADIRNAME)/locale
41 -+localedir = @localedir@
42 - subdir = po
43 - install_sh = @install_sh@
44 - # Automake >= 1.8 provides @mkdir_p@.
45 -@@ -108,7 +107,7 @@
46 - install-data-yes: all
47 - linguas="$(USE_LINGUAS)"; \
48 - for lang in $$linguas; do \
49 -- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
50 -+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
51 - $(mkdir_p) $$dir; \
52 - if test -r $$lang.gmo; then \
53 - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
54 -@@ -142,8 +141,8 @@
55 - uninstall:
56 - linguas="$(USE_LINGUAS)"; \
57 - for lang in $$linguas; do \
58 -- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
59 -- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
60 -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
61 -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
62 - done
63 -
64 - check: all $(GETTEXT_PACKAGE).pot
65 -
66 -=== modified file 'intltool.m4'
67 ---- intltool.m4 2012-02-20 14:50:33 +0000
68 -+++ intltool.m4 2013-05-12 17:08:09 +0000
69 -@@ -155,31 +155,6 @@
70 - # Substitute ALL_LINGUAS so we can use it in po/Makefile
71 - AC_SUBST(ALL_LINGUAS)
72 -
73 --# Set DATADIRNAME correctly if it is not set yet
74 --# (copied from glib-gettext.m4)
75 --if test -z "$DATADIRNAME"; then
76 -- AC_LINK_IFELSE(
77 -- [AC_LANG_PROGRAM([[]],
78 -- [[extern int _nl_msg_cat_cntr;
79 -- return _nl_msg_cat_cntr]])],
80 -- [DATADIRNAME=share],
81 -- [case $host in
82 -- *-*-solaris*)
83 -- dnl On Solaris, if bind_textdomain_codeset is in libc,
84 -- dnl GNU format message catalog is always supported,
85 -- dnl since both are added to the libc all together.
86 -- dnl Hence, we'd like to go with DATADIRNAME=share
87 -- dnl in this case.
88 -- AC_CHECK_FUNC(bind_textdomain_codeset,
89 -- [DATADIRNAME=share], [DATADIRNAME=lib])
90 -- ;;
91 -- *)
92 -- [DATADIRNAME=lib]
93 -- ;;
94 -- esac])
95 --fi
96 --AC_SUBST(DATADIRNAME)
97 --
98 - IT_PO_SUBDIR([po])
99 -
100 - ])
101 -
102
103 diff --git a/dev-util/intltool/intltool-0.50.2-r1.ebuild b/dev-util/intltool/intltool-0.50.2-r1.ebuild
104 deleted file mode 100644
105 index ce380d8f20a..00000000000
106 --- a/dev-util/intltool/intltool-0.50.2-r1.ebuild
107 +++ /dev/null
108 @@ -1,32 +0,0 @@
109 -# Copyright 1999-2017 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -
112 -EAPI=5
113 -inherit eutils
114 -
115 -DESCRIPTION="Internationalization Tool Collection"
116 -HOMEPAGE="https://launchpad.net/intltool/"
117 -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
118 -
119 -LICENSE="GPL-2"
120 -SLOT="0"
121 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
122 -IUSE=""
123 -
124 -DEPEND="
125 - >=dev-lang/perl-5.8.1
126 - dev-perl/XML-Parser
127 -"
128 -RDEPEND="${DEPEND}
129 - sys-devel/gettext
130 -"
131 -DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
132 -
133 -src_prepare() {
134 - # Use plain localedir to install mo files to, rather than trying to
135 - # guess one, bug #432848#c11
136 - epatch "${FILESDIR}/${P}-localedir-fix.patch"
137 -
138 - # Fix handling absolute paths in single file key output, bug #470040
139 - epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch"
140 -}
141
142 diff --git a/dev-util/intltool/intltool-0.51.0.ebuild b/dev-util/intltool/intltool-0.51.0.ebuild
143 deleted file mode 100644
144 index cfd5ea16f0c..00000000000
145 --- a/dev-util/intltool/intltool-0.51.0.ebuild
146 +++ /dev/null
147 @@ -1,29 +0,0 @@
148 -# Copyright 1999-2017 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=5
152 -inherit eutils
153 -
154 -DESCRIPTION="Internationalization Tool Collection"
155 -HOMEPAGE="https://launchpad.net/intltool/"
156 -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
157 -
158 -LICENSE="GPL-2"
159 -SLOT="0"
160 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
161 -IUSE=""
162 -
163 -DEPEND="
164 - >=dev-lang/perl-5.8.1
165 - dev-perl/XML-Parser
166 -"
167 -RDEPEND="${DEPEND}
168 - sys-devel/gettext
169 -"
170 -DOCS=( AUTHORS ChangeLog NEWS README TODO doc/I18N-HOWTO )
171 -
172 -src_prepare() {
173 - # Fix handling absolute paths in single file key output, bug #470040
174 - # https://bugs.launchpad.net/intltool/+bug/1168941
175 - epatch "${FILESDIR}/${PN}-0.50.2-absolute-paths.patch"
176 -}