[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/ - gentoo-commits

From:	"Michał Górny" <mgorny@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: profiles/base/, profiles/embedded/, profiles/desc/
Date:	Thu, 26 May 2016 17:38:55
Message-Id:	`1464284325.f75ecfc4a925b3ee8a0157500aaaae1bd45bd348.mgorny@gentoo`

1

commit:     f75ecfc4a925b3ee8a0157500aaaae1bd45bd348

2

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

3

AuthorDate: Thu May 26 17:32:04 2016 +0000

4

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

5

CommitDate: Thu May 26 17:38:45 2016 +0000

6

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

7

8

profiles: Remove unused FOO2ZJS_DEVICES USE_EXPAND

9

10

 profiles/base/make.defaults        |  2 +-

11

 profiles/desc/foo2zjs_devices.desc | 52 --------------------------------------

12

 profiles/embedded/make.defaults    |  2 +-

13

 3 files changed, 2 insertions(+), 54 deletions(-)

14

15

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults

16

index 939e448..f641e4a 100644

17

--- a/profiles/base/make.defaults

18

+++ b/profiles/base/make.defaults

19

@@ -16,7 +16,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"

20

21

 # Env vars to expand into USE vars.  Modifying this requires prior

22

 # discussion on gentoo-dev@l.g.o.

23

-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"

24

+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"

25

26

 # USE_EXPAND variables whose contents are not shown in package manager

27

 # output. Changes need discussion on gentoo-dev.

28

29

diff --git a/profiles/desc/foo2zjs_devices.desc b/profiles/desc/foo2zjs_devices.desc

30

deleted file mode 100644

31

index 06bc63c..0000000

32

--- a/profiles/desc/foo2zjs_devices.desc

33

+++ /dev/null

34

@@ -1,52 +0,0 @@

35

-# Copyright 1999-2013 Gentoo Foundation.

36

-# Distributed under the terms of the GNU General Public License v2

37

-# $Id$

38

-

39

-# This file contains descriptions of FOO2ZJS_DEVICES USE_EXPAND flags.

40

-# created by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh

41

-

42

-# Keep it sorted.

43

-

44

-hp2600n - Get HP Color LaserJet 2600n .ICM files

45

-hp1600 - Get HP Color LaserJet 1600 .ICM files

46

-hp1500 - Get HP Color LaserJet 1500 .ICM files

47

-

48

-km2530 - Get Konica Minolta 2530 DL .ICM files

49

-km2490 - Get Konica Minolta 2490 MF .ICM files

50

-km2480 - Get Konica Minolta 2480 MF .ICM files

51

-xp6115 - Get Xerox Phaser 6115MFP .ICM files

52

-

53

-km2430 - Get Konica Minolta 2430 DL .ICM files

54

-km2300 - Get Minolta 2300 DL .ICM files

55

-km2200 - Get Minolta 2200 DL .ICM files

56

-kmcpwl - Get Minolta Color PageWorks/Pro L .ICM files

57

-

58

-sa300 - Get Samsung CLP-300 .ICM files

59

-sa315 - Get Samsung CLP-315 .ICM files

60

-sa2160 - Get Samsung CLX-2160 .ICM files

61

-sa3160 - Get Samsung CLX-3160 .ICM files

62

-xp6110 - Get Xerox Phaser 6110 and 6110MFP .ICM files

63

-

64

-lm500 - Get Lexmark C500 .ICM files

65

-

66

-oki3200 - Get Oki C3200 .ICM files

67

-oki3300 - Get Oki C3300 .ICM files

68

-oki3400 - Get Oki C3400 .ICM files

69

-oki3530 - Get Oki C3530 .ICM files

70

-oki5100 - Get Oki C5100 .ICM files

71

-oki5200 - Get Oki C5200 .ICM files

72

-oki5500 - Get Oki C5500 .ICM files

73

-oki5600 - Get Oki C5600 .ICM files

74

-oki5800 - Get Oki C5800 .ICM files

75

-

76

-hp1215 - Get HP LJ 1215 firmware file

77

-hp1020 - Get HP LJ 1020 firmware file

78

-hp1018 - Get HP LJ 1005 firmware file

79

-hp1005 - Get HP LJ 1005 firmware file

80

-hp1000 - Get HP LJ 1000 firmware file

81

-

82

-hpp1505 - Get HP LJ P1505 firmware file

83

-hpp1008 - Get HP LJ P1008 firmware file

84

-hpp1007 - Get HP LJ P1007 firmware file

85

-hpp1006 - Get HP LJ P1006 firmware file

86

-hpp1005 - Get HP LJ P1005 firmware file

87

88

diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults

89

index c84434a..d555394 100644

90

--- a/profiles/embedded/make.defaults

91

+++ b/profiles/embedded/make.defaults

92

@@ -27,7 +27,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"

93

94

 # Env vars to expand into USE vars.  Modifying this requires prior

95

 # discussion on gentoo-dev@l.g.o.

96

-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"

97

+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"

98

99

 # USE_EXPAND variables whose contents are not shown in package manager

100

 # output. Changes need discussion on gentoo-dev.

1	commit: f75ecfc4a925b3ee8a0157500aaaae1bd45bd348
2	Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3	AuthorDate: Thu May 26 17:32:04 2016 +0000
4	Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5	CommitDate: Thu May 26 17:38:45 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75ecfc4
7
8	profiles: Remove unused FOO2ZJS_DEVICES USE_EXPAND
9
10	profiles/base/make.defaults \| 2 +-
11	profiles/desc/foo2zjs_devices.desc \| 52 --------------------------------------
12	profiles/embedded/make.defaults \| 2 +-
13	3 files changed, 2 insertions(+), 54 deletions(-)
14
15	diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
16	index 939e448..f641e4a 100644
17	--- a/profiles/base/make.defaults
18	+++ b/profiles/base/make.defaults
19	@@ -16,7 +16,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
20
21	# Env vars to expand into USE vars. Modifying this requires prior
22	# discussion on gentoo-dev@l.g.o.
23	-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FOO2ZJS_DEVICES FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"
24	+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_X86 CROSSCOMPILE_OPTS CURL_SSL DRACUT_MODULES DVB_CARDS ELIBC ENLIGHTENMENT_MODULES FCDSL_CARDS FFTOOLS FRITZCAPI_CARDS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL LCD_DEVICES LIBREOFFICE_EXTENSIONS LINGUAS LIRC_DEVICES MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS ROS_MESSAGES"
25
26	# USE_EXPAND variables whose contents are not shown in package manager
27	# output. Changes need discussion on gentoo-dev.
28
29	diff --git a/profiles/desc/foo2zjs_devices.desc b/profiles/desc/foo2zjs_devices.desc
30	deleted file mode 100644
31	index 06bc63c..0000000
32	--- a/profiles/desc/foo2zjs_devices.desc
33	+++ /dev/null
34	@@ -1,52 +0,0 @@
35	-# Copyright 1999-2013 Gentoo Foundation.
36	-# Distributed under the terms of the GNU General Public License v2
37	-# $Id$
38	-
39	-# This file contains descriptions of FOO2ZJS_DEVICES USE_EXPAND flags.
40	-# created by http://gentooexperimental.org/~genstef/dist/foo2zjs-helper.sh
41	-
42	-# Keep it sorted.
43	-
44	-hp2600n - Get HP Color LaserJet 2600n .ICM files
45	-hp1600 - Get HP Color LaserJet 1600 .ICM files
46	-hp1500 - Get HP Color LaserJet 1500 .ICM files
47	-
48	-km2530 - Get Konica Minolta 2530 DL .ICM files
49	-km2490 - Get Konica Minolta 2490 MF .ICM files
50	-km2480 - Get Konica Minolta 2480 MF .ICM files
51	-xp6115 - Get Xerox Phaser 6115MFP .ICM files
52	-
53	-km2430 - Get Konica Minolta 2430 DL .ICM files
54	-km2300 - Get Minolta 2300 DL .ICM files
55	-km2200 - Get Minolta 2200 DL .ICM files
56	-kmcpwl - Get Minolta Color PageWorks/Pro L .ICM files
57	-
58	-sa300 - Get Samsung CLP-300 .ICM files
59	-sa315 - Get Samsung CLP-315 .ICM files
60	-sa2160 - Get Samsung CLX-2160 .ICM files
61	-sa3160 - Get Samsung CLX-3160 .ICM files
62	-xp6110 - Get Xerox Phaser 6110 and 6110MFP .ICM files
63	-
64	-lm500 - Get Lexmark C500 .ICM files
65	-
66	-oki3200 - Get Oki C3200 .ICM files
67	-oki3300 - Get Oki C3300 .ICM files
68	-oki3400 - Get Oki C3400 .ICM files
69	-oki3530 - Get Oki C3530 .ICM files
70	-oki5100 - Get Oki C5100 .ICM files
71	-oki5200 - Get Oki C5200 .ICM files
72	-oki5500 - Get Oki C5500 .ICM files
73	-oki5600 - Get Oki C5600 .ICM files
74	-oki5800 - Get Oki C5800 .ICM files
75	-
76	-hp1215 - Get HP LJ 1215 firmware file
77	-hp1020 - Get HP LJ 1020 firmware file
78	-hp1018 - Get HP LJ 1005 firmware file
79	-hp1005 - Get HP LJ 1005 firmware file
80	-hp1000 - Get HP LJ 1000 firmware file
81	-
82	-hpp1505 - Get HP LJ P1505 firmware file
83	-hpp1008 - Get HP LJ P1008 firmware file
84	-hpp1007 - Get HP LJ P1007 firmware file
85	-hpp1006 - Get HP LJ P1006 firmware file
86	-hpp1005 - Get HP LJ P1005 firmware file
87
88	diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
89	index c84434a..d555394 100644
90	--- a/profiles/embedded/make.defaults
91	+++ b/profiles/embedded/make.defaults
92	@@ -27,7 +27,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
93
94	# Env vars to expand into USE vars. Modifying this requires prior
95	# discussion on gentoo-dev@l.g.o.
96	-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"
97	+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET ABI_MIPS ABI_X86 ROS_MESSAGES"
98
99	# USE_EXPAND variables whose contents are not shown in package manager
100	# output. Changes need discussion on gentoo-dev.

Gentoo Archives: gentoo-commits