Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/ftdi_eeprom/, profiles/, dev-embedded/ftdi_eeprom/files/
Date: Wed, 30 Sep 2020 15:17:57
Message-Id: 1601479037.2f1032085b9ffb2bae0a22ab41489af7184423b5.sam@gentoo
1 commit: 2f1032085b9ffb2bae0a22ab41489af7184423b5
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 15:16:54 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 15:17:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f103208
7
8 dev-embedded/ftdi_eeprom: remove last-rited package
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-embedded/ftdi_eeprom/Manifest | 1 -
13 .../files/ftdi_eeprom-0.3-chip-type.patch | 15 ------------
14 .../files/ftdi_eeprom-0.3-newer-chips.patch | 23 ------------------
15 dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild | 28 ----------------------
16 dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild | 19 ---------------
17 dev-embedded/ftdi_eeprom/metadata.xml | 8 -------
18 profiles/package.mask | 5 ----
19 7 files changed, 99 deletions(-)
20
21 diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
22 deleted file mode 100644
23 index f85373e0564..00000000000
24 --- a/dev-embedded/ftdi_eeprom/Manifest
25 +++ /dev/null
26 @@ -1 +0,0 @@
27 -DIST ftdi_eeprom-0.3.tar.gz 103723 BLAKE2B a378b82f3e2239a62b9002933ac5b5bbfab326f33b893712a78489115348fce6401d80ea454355fac8349354437eb852489e2bd2474182c303fa03ba57dfbd2d SHA512 292617434d618c1f47fd94922cff1c32da271a9262b70ee56a8931b7a07ec1ae2cfe92a0ddfe14d9516d295188dc0a750c0cf7f5a26bb4c3fd384f252aeda18d
28
29 diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
30 deleted file mode 100644
31 index 1492194045a..00000000000
32 --- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
33 +++ /dev/null
34 @@ -1,15 +0,0 @@
35 -https://bugs.gentoo.org/390805
36 -
37 -fix by Egor Y. Egorov for building with newer libftdi versions
38 -
39 ---- a/src/main.c
40 -+++ b/src/main.c
41 -@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
42 -
43 - eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
44 - eeprom.product_id = cfg_getint(cfg, "product_id");
45 -- eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
46 -+ eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
47 -
48 - eeprom.self_powered = cfg_getbool(cfg, "self_powered");
49 - eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
50
51 diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
52 deleted file mode 100644
53 index 7a678cd4bce..00000000000
54 --- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
55 +++ /dev/null
56 @@ -1,23 +0,0 @@
57 -latest upstream vcs tree supports this stuff in a diff way
58 -
59 -https://bugs.gentoo.org/376117
60 -
61 -patch by Robert Pearce
62 -
63 ---- ftdi_eeprom-0.2/src/main.c
64 -+++ ftdi_eeprom-0.2/src/main.c
65 -@@ -131,9 +131,13 @@
66 -
67 - if (i != 0) {
68 - printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
69 -- printf("Retrying with default FTDI id.\n");
70 -+ printf("Retrying with default FTDI ids.\n");
71 -
72 - i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
73 -+ if (i != 0)
74 -+ i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
75 -+ if (i != 0)
76 -+ i = ftdi_usb_open(&ftdi, 0x0403, 0x6011);
77 - if (i != 0) {
78 - printf("Sorry, unable to find FTDI USB chip\n");
79 - exit (-1);
80
81 diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
82 deleted file mode 100644
83 index e488beb2ab5..00000000000
84 --- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
85 +++ /dev/null
86 @@ -1,28 +0,0 @@
87 -# Copyright 1999-2020 Gentoo Authors
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=4
91 -inherit eutils
92 -
93 -DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
94 -HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
95 -SRC_URI="https://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
96 -
97 -LICENSE="LGPL-2"
98 -SLOT="0"
99 -KEYWORDS="amd64 x86"
100 -IUSE=""
101 -
102 -RDEPEND="dev-embedded/libftdi:0
103 - dev-libs/confuse"
104 -DEPEND="${RDEPEND}"
105 -
106 -src_prepare() {
107 - epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
108 - epatch "${FILESDIR}"/${PN}-0.3-chip-type.patch #390805
109 -}
110 -
111 -src_install() {
112 - default
113 - dodoc src/example.conf
114 -}
115
116 diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
117 deleted file mode 100644
118 index 5479b10f65b..00000000000
119 --- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
120 +++ /dev/null
121 @@ -1,19 +0,0 @@
122 -# Copyright 1999-2020 Gentoo Authors
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI=4
126 -
127 -DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
128 -HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
129 -
130 -LICENSE="LGPL-2"
131 -SLOT="0"
132 -KEYWORDS="~amd64 ~x86"
133 -IUSE=""
134 -
135 -RDEPEND="dev-embedded/libftdi:1[tools]"
136 -
137 -pkg_setup() {
138 - elog "This tool has moved to libftdi itself (via USE=tools)."
139 - elog "Please install that package and remove this one."
140 -}
141
142 diff --git a/dev-embedded/ftdi_eeprom/metadata.xml b/dev-embedded/ftdi_eeprom/metadata.xml
143 deleted file mode 100644
144 index 71b1461e114..00000000000
145 --- a/dev-embedded/ftdi_eeprom/metadata.xml
146 +++ /dev/null
147 @@ -1,8 +0,0 @@
148 -<?xml version="1.0" encoding="UTF-8"?>
149 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
150 -<pkgmetadata>
151 -<maintainer type="project">
152 - <email>embedded@g.o</email>
153 - <name>Embedded Gentoo</name>
154 -</maintainer>
155 -</pkgmetadata>
156
157 diff --git a/profiles/package.mask b/profiles/package.mask
158 index 4d2a2ef9294..51a26850d31 100644
159 --- a/profiles/package.mask
160 +++ b/profiles/package.mask
161 @@ -618,11 +618,6 @@ app-text/fbless
162 # bug 699834. Removal in 30 days.
163 www-apps/ampache
164
165 -# Aaron Bauman <bman@g.o> (2020-08-29)
166 -# EAPI=4, use dev-embedded/libftd[tools] instead
167 -# Removal in 30 days
168 -dev-embedded/ftdi_eeprom
169 -
170 # Piotr Karbowski <slashbeast@g.o> (2020-08-28)
171 # Temporary mask due to multiple reports of segfaults at startup, bug #739056
172 =x11-base/xorg-server-1.20.9