Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/g810-led/, app-misc/g810-led/files/
Date: Tue, 05 Feb 2019 06:20:39
Message-Id: 1549326612.035bd9316d2b66f6e540ac91fabe5d7db07fa139.asturm@gentoo
1 commit: 035bd9316d2b66f6e540ac91fabe5d7db07fa139
2 Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
3 AuthorDate: Tue Jan 8 01:25:14 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 5 00:30:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=035bd931
7
8 app-misc/g810-led: Remove old (0.2.7)
9
10 Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 app-misc/g810-led/Manifest | 1 -
14 ...0-led-0.2.7-Have_makefile_use_environment.patch | 63 ----------------------
15 app-misc/g810-led/g810-led-0.2.7.ebuild | 52 ------------------
16 3 files changed, 116 deletions(-)
17
18 diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
19 index 2cd4d906598..e822820b6ca 100644
20 --- a/app-misc/g810-led/Manifest
21 +++ b/app-misc/g810-led/Manifest
22 @@ -1,2 +1 @@
23 -DIST g810-led-0.2.7.tar.gz 33127 BLAKE2B 1ffa28f4e21273afa805ff2ddfeae00cf4b25382f7da617016651283331d7d17faee1e6f68d00ab988c30ba1a7d4b252cf28c021999871a7fbe54c47ae3ccb23 SHA512 f67d44f1c51a29cbdfe9bb5e28f3dea5e9b08aa5e2a08cf875578d6b74e8e77f880378c825efcc3068b400131295e1fd196454b8b10143c4f5d5f77be760512a
24 DIST g810-led-0.3.1.tar.gz 34069 BLAKE2B ebc83e1f0908e521573f6ea812c1893e8314548dbe30cad4a8f2af171eaf7f73ba905f6e01eafe9bca6c1bf006d626086091c871c6382dcd9a58caa76173ca59 SHA512 62bf73a897f8c1c967ce64f6e352d55b08af764b2aac8ce722906cdc67db28676bc5665d1ba307f0c43360e57d53e75fa39aea29ca7aa6da2e125782ae38446c
25
26 diff --git a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch b/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
27 deleted file mode 100644
28 index 249462bbcf0..00000000000
29 --- a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
30 +++ /dev/null
31 @@ -1,63 +0,0 @@
32 -diff --git a/makefile b/makefile
33 -index 019636d..707517d 100644
34 ---- a/makefile
35 -+++ b/makefile
36 -@@ -1,18 +1,18 @@
37 --CC=g++
38 --CFLAGS=-Wall -O2 -std=gnu++11
39 -+CXX?=g++
40 -+CXXFLAGS?=-Wall -O2
41 - LIB?=hidapi
42 - ifeq ($(LIB),libusb)
43 - CPPFLAGS=-Dlibusb
44 -- LDFLAGS=-lusb-1.0
45 -+ LIBS=-lusb-1.0
46 - else
47 - CPPFLAGS=-Dhidapi
48 -- LDFLAGS=-lhidapi-hidraw
49 -+ LIBS=-lhidapi-hidraw
50 - endif
51 - SYSTEMDDIR?=/usr/lib/systemd
52 -
53 --prefix?=$(DESTDIR)/usr
54 --libdir?=$(prefix)/lib
55 --includedir?=$(prefix)/include
56 -+PREFIX?=$(DESTDIR)/usr
57 -+libdir?=$(PREFIX)/lib
58 -+includedir?=$(PREFIX)/include
59 -
60 - # Program & versioning information
61 - PROGN=g810-led
62 -@@ -20,7 +20,7 @@ MAJOR=0
63 - MINOR=2
64 - MICRO=7
65 -
66 --CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
67 -+CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
68 - APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
69 - LIBSRCS=src/classes/*.cpp src/classes/*.h
70 -
71 -@@ -32,19 +32,19 @@ bin: bin/$(PROGN)
72 -
73 - bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
74 - @mkdir -p bin
75 -- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS)
76 -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
77 -
78 --debug: CFLAGS += -g -Wextra -pedantic
79 -+debug: CXXFLAGS += -g -Wextra -pedantic
80 - debug: bin/$(PROGN)
81 -
82 - lib/lib$(PROGN).so: $(LIBSRCS)
83 - @mkdir -p lib
84 -- $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
85 -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
86 - @ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
87 -
88 - bin-linked: lib/lib$(PROGN).so
89 - @mkdir -p bin
90 -- $(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
91 -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN)
92 -
93 - lib: lib/lib$(PROGN).so
94 -
95
96 diff --git a/app-misc/g810-led/g810-led-0.2.7.ebuild b/app-misc/g810-led/g810-led-0.2.7.ebuild
97 deleted file mode 100644
98 index 9251fa585b8..00000000000
99 --- a/app-misc/g810-led/g810-led-0.2.7.ebuild
100 +++ /dev/null
101 @@ -1,52 +0,0 @@
102 -# Copyright 1999-2018 Gentoo Foundation
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI=6
106 -
107 -inherit systemd udev eutils
108 -
109 -DESCRIPTION="Led controller for Logitech G- 213, 410, 413, 610, 810, 910 and PRO Keyboards"
110 -HOMEPAGE="https://github.com/MatMoul/g810-led"
111 -SRC_URI="https://github.com/MatMoul/g810-led/archive/v${PV}.tar.gz -> ${P}.tar.gz"
112 -
113 -LICENSE="GPL-3"
114 -SLOT="0"
115 -KEYWORDS="~amd64"
116 -IUSE="+hidapi"
117 -
118 -RDEPEND="
119 - hidapi? ( dev-libs/hidapi:= )
120 - !hidapi? ( virtual/libusb:= )
121 -"
122 -
123 -DEPEND="${RDEPEND}"
124 -
125 -DOCS=("README.md" "sample_profiles")
126 -
127 -src_prepare() {
128 - eapply "${FILESDIR}/g810-led-0.2.7-Have_makefile_use_environment.patch"
129 - default
130 -}
131 -
132 -src_compile() {
133 - emake LIB="$(usex hidapi hidapi libusb)"
134 -}
135 -
136 -src_install() {
137 - dolib.so "lib/libg810-led.so.${PV}"
138 - dosym "libg810-led.so.${PV}" "/usr/$(get_libdir)/libg810-led.so"
139 -
140 - dobin bin/g810-led
141 - local boards=(213 410 413 610 910 pro)
142 - local x
143 - for x in "${boards[@]}"; do
144 - dosym g810-led "/usr/bin/g${x}-led"
145 - done
146 -
147 - systemd_dounit systemd/g810-led.service
148 - systemd_dounit systemd/g810-led-reboot.service
149 -
150 - udev_newrules udev/g810-led.rules 60-g810-led.rules
151 -
152 - einstalldocs
153 -}