[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/
Date:	Sun, 26 Aug 2018 08:25:25
Message-Id:	`1535271909.b8f30561aece8d833fcc6e6a2ab7a4e16ea80d68.mgorny@gentoo`

1

commit:     b8f30561aece8d833fcc6e6a2ab7a4e16ea80d68

2

Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>

3

AuthorDate: Sun Aug 26 08:02:33 2018 +0000

4

Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>

5

CommitDate: Sun Aug 26 08:25:09 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f30561

7

8

app-i18n/uim: Remove support for non-existent deps

9

10

 app-i18n/uim/uim-1.8.6-r1.ebuild | 17 +++++++----------

11

 app-i18n/uim/uim-1.8.6-r2.ebuild | 17 +++++++----------

12

 2 files changed, 14 insertions(+), 20 deletions(-)

13

14

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild

15

index af634f34baf..8a86ae8ad0f 100644

16

--- a/app-i18n/uim/uim-1.8.6-r1.ebuild

17

+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild

18

@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"

19

 LICENSE="BSD GPL-2 LGPL-2.1"

20

 SLOT="0"

21

 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"

22

-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"

23

+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"

24

 RESTRICT="test"

25

 REQUIRED_USE="gtk? ( X )

26

 	gtk2? ( X )

27

-	qt4? ( X )

28

 	xft? ( X )"

29

30

 CDEPEND="!dev-scheme/sigscheme

31

@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme

32

 	m17n-lib? ( dev-libs/m17n-lib )

33

 	ncurses? ( sys-libs/ncurses:0= )

34

 	nls? ( virtual/libintl )

35

-	qt4? ( dev-qt/qtgui:4[qt3support] )

36

 	skk? ( app-i18n/skk-jisyo )

37

 	sqlite? ( dev-db/sqlite:3 )

38

 	ssl? ( dev-libs/openssl:0 )"

39

@@ -111,16 +109,16 @@ src_configure() {

40

 		$(use_with m17n-lib m17nlib)

41

 		$(use_enable ncurses fep)

42

 		$(use_enable nls)

43

-		$(use_with qt4 qt4)

44

-		$(use_with qt4 qt4-immodule)

45

-		$(use_enable qt4 qt4-qt3support)

46

+		--without-qt4

47

+		--without-qt4-immodule

48

+		--disable-qt4-qt3support

49

 		$(use_with skk)

50

 		$(use_with sqlite sqlite3)

51

 		$(use_enable ssl openssl)

52

 		$(use_enable static-libs static)

53

 		$(use_with xft)

54

 		--without-anthy

55

-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))

56

+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))

57

 		--disable-gnome-applet

58

 		--disable-gnome3-applet

59

 		--disable-kde-applet

60

@@ -139,13 +137,12 @@ src_configure() {

61

 		myconf+=( --enable-notify=libnotify )

62

fi

63

64

-	if use gtk || use gtk2 || use qt4; then

65

+	if use gtk || use gtk2; then

66

 		myconf+=( --enable-pref )

67

 	else

68

 		myconf+=( --disable-pref )

69

fi

70

71

-	export QT4DIR="$(qt4_get_libdir)"

72

 	econf "${myconf[@]}"

73

}

74

75

@@ -190,7 +187,7 @@ pkg_postinst() {

76

 	elog "to your ~/.uim."

77

 	elog

78

 	elog "All input methods can be found by running uim-im-switcher-gtk, "

79

-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."

80

+	elog "uim-im-switcher-gtk3."

81

82

 	if use emacs; then

83

 		elisp-site-regen

84

85

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild

86

index 8ecd96c0215..3183a39a2a3 100644

87

--- a/app-i18n/uim/uim-1.8.6-r2.ebuild

88

+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild

89

@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"

90

 LICENSE="BSD GPL-2 LGPL-2.1"

91

 SLOT="0"

92

 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"

93

-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"

94

+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"

95

 RESTRICT="test"

96

 REQUIRED_USE="gtk? ( X )

97

 	gtk2? ( X )

98

-	qt4? ( X )

99

 	xft? ( X )"

100

101

 CDEPEND="!dev-scheme/sigscheme

102

@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme

103

 	m17n-lib? ( dev-libs/m17n-lib )

104

 	ncurses? ( sys-libs/ncurses:0= )

105

 	nls? ( virtual/libintl )

106

-	qt4? ( dev-qt/qtgui:4[qt3support] )

107

 	skk? ( app-i18n/skk-jisyo )

108

 	sqlite? ( dev-db/sqlite:3 )

109

 	ssl? (

110

@@ -115,16 +113,16 @@ src_configure() {

111

 		$(use_with m17n-lib m17nlib)

112

 		$(use_enable ncurses fep)

113

 		$(use_enable nls)

114

-		$(use_with qt4 qt4)

115

-		$(use_with qt4 qt4-immodule)

116

-		$(use_enable qt4 qt4-qt3support)

117

+		--without-qt4

118

+		--without-qt4-immodule

119

+		--disable-qt4-qt3support

120

 		$(use_with skk)

121

 		$(use_with sqlite sqlite3)

122

 		$(use_enable ssl openssl)

123

 		$(use_enable static-libs static)

124

 		$(use_with xft)

125

 		--without-anthy

126

-		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))

127

+		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))

128

 		--disable-gnome-applet

129

 		--disable-gnome3-applet

130

 		--disable-kde-applet

131

@@ -143,13 +141,12 @@ src_configure() {

132

 		myconf+=( --enable-notify=libnotify )

133

fi

134

135

-	if use gtk || use gtk2 || use qt4; then

136

+	if use gtk || use gtk2; then

137

 		myconf+=( --enable-pref )

138

 	else

139

 		myconf+=( --disable-pref )

140

fi

141

142

-	export QT4DIR="$(qt4_get_libdir)"

143

 	econf "${myconf[@]}"

144

}

145

146

@@ -194,7 +191,7 @@ pkg_postinst() {

147

 	elog "to your ~/.uim."

148

 	elog

149

 	elog "All input methods can be found by running uim-im-switcher-gtk, "

150

-	elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."

151

+	elog "uim-im-switcher-gtk3."

152

153

 	if use emacs; then

154

 		elisp-site-regen

1	commit: b8f30561aece8d833fcc6e6a2ab7a4e16ea80d68
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Sun Aug 26 08:02:33 2018 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Sun Aug 26 08:25:09 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f30561
7
8	app-i18n/uim: Remove support for non-existent deps
9
10	app-i18n/uim/uim-1.8.6-r1.ebuild \| 17 +++++++----------
11	app-i18n/uim/uim-1.8.6-r2.ebuild \| 17 +++++++----------
12	2 files changed, 14 insertions(+), 20 deletions(-)
13
14	diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
15	index af634f34baf..8a86ae8ad0f 100644
16	--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
17	+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
18	@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
19	LICENSE="BSD GPL-2 LGPL-2.1"
20	SLOT="0"
21	KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
22	-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
23	+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
24	RESTRICT="test"
25	REQUIRED_USE="gtk? ( X )
26	gtk2? ( X )
27	- qt4? ( X )
28	xft? ( X )"
29
30	CDEPEND="!dev-scheme/sigscheme
31	@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme
32	m17n-lib? ( dev-libs/m17n-lib )
33	ncurses? ( sys-libs/ncurses:0= )
34	nls? ( virtual/libintl )
35	- qt4? ( dev-qt/qtgui:4[qt3support] )
36	skk? ( app-i18n/skk-jisyo )
37	sqlite? ( dev-db/sqlite:3 )
38	ssl? ( dev-libs/openssl:0 )"
39	@@ -111,16 +109,16 @@ src_configure() {
40	$(use_with m17n-lib m17nlib)
41	$(use_enable ncurses fep)
42	$(use_enable nls)
43	- $(use_with qt4 qt4)
44	- $(use_with qt4 qt4-immodule)
45	- $(use_enable qt4 qt4-qt3support)
46	+ --without-qt4
47	+ --without-qt4-immodule
48	+ --disable-qt4-qt3support
49	$(use_with skk)
50	$(use_with sqlite sqlite3)
51	$(use_enable ssl openssl)
52	$(use_enable static-libs static)
53	$(use_with xft)
54	--without-anthy
55	- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
56	+ --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
57	--disable-gnome-applet
58	--disable-gnome3-applet
59	--disable-kde-applet
60	@@ -139,13 +137,12 @@ src_configure() {
61	myconf+=( --enable-notify=libnotify )
62	fi
63
64	- if use gtk \|\| use gtk2 \|\| use qt4; then
65	+ if use gtk \|\| use gtk2; then
66	myconf+=( --enable-pref )
67	else
68	myconf+=( --disable-pref )
69	fi
70
71	- export QT4DIR="$(qt4_get_libdir)"
72	econf "${myconf[@]}"
73	}
74
75	@@ -190,7 +187,7 @@ pkg_postinst() {
76	elog "to your ~/.uim."
77	elog
78	elog "All input methods can be found by running uim-im-switcher-gtk, "
79	- elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
80	+ elog "uim-im-switcher-gtk3."
81
82	if use emacs; then
83	elisp-site-regen
84
85	diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
86	index 8ecd96c0215..3183a39a2a3 100644
87	--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
88	+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
89	@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
90	LICENSE="BSD GPL-2 LGPL-2.1"
91	SLOT="0"
92	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
93	-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
94	+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"
95	RESTRICT="test"
96	REQUIRED_USE="gtk? ( X )
97	gtk2? ( X )
98	- qt4? ( X )
99	xft? ( X )"
100
101	CDEPEND="!dev-scheme/sigscheme
102	@@ -43,7 +42,6 @@ CDEPEND="!dev-scheme/sigscheme
103	m17n-lib? ( dev-libs/m17n-lib )
104	ncurses? ( sys-libs/ncurses:0= )
105	nls? ( virtual/libintl )
106	- qt4? ( dev-qt/qtgui:4[qt3support] )
107	skk? ( app-i18n/skk-jisyo )
108	sqlite? ( dev-db/sqlite:3 )
109	ssl? (
110	@@ -115,16 +113,16 @@ src_configure() {
111	$(use_with m17n-lib m17nlib)
112	$(use_enable ncurses fep)
113	$(use_enable nls)
114	- $(use_with qt4 qt4)
115	- $(use_with qt4 qt4-immodule)
116	- $(use_enable qt4 qt4-qt3support)
117	+ --without-qt4
118	+ --without-qt4-immodule
119	+ --disable-qt4-qt3support
120	$(use_with skk)
121	$(use_with sqlite sqlite3)
122	$(use_enable ssl openssl)
123	$(use_enable static-libs static)
124	$(use_with xft)
125	--without-anthy
126	- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt4 qt4)))
127	+ --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
128	--disable-gnome-applet
129	--disable-gnome3-applet
130	--disable-kde-applet
131	@@ -143,13 +141,12 @@ src_configure() {
132	myconf+=( --enable-notify=libnotify )
133	fi
134
135	- if use gtk \|\| use gtk2 \|\| use qt4; then
136	+ if use gtk \|\| use gtk2; then
137	myconf+=( --enable-pref )
138	else
139	myconf+=( --disable-pref )
140	fi
141
142	- export QT4DIR="$(qt4_get_libdir)"
143	econf "${myconf[@]}"
144	}
145
146	@@ -194,7 +191,7 @@ pkg_postinst() {
147	elog "to your ~/.uim."
148	elog
149	elog "All input methods can be found by running uim-im-switcher-gtk, "
150	- elog "uim-im-switcher-gtk3 or uim-im-switcher-qt4."
151	+ elog "uim-im-switcher-gtk3."
152
153	if use emacs; then
154	elisp-site-regen

Gentoo Archives: gentoo-commits