Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jusb/files/, profiles/, dev-java/jusb/
Date: Tue, 18 Apr 2017 15:08:56
Message-Id: 1492528115.ebed97cf4d24783af5ca9942a4a184f05edfffd4.mgorny@gentoo
1 commit: ebed97cf4d24783af5ca9942a4a184f05edfffd4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 18 14:59:20 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 18 15:08:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebed97cf
7
8 dev-java/jusb: Remove last-rited pkg, #279088
9
10 dev-java/jusb/Manifest | 1 -
11 dev-java/jusb/files/jusb-0.4.4-makefile.patch | 15 ------
12 dev-java/jusb/files/jusb-0.4.4-native.patch | 20 -------
13 dev-java/jusb/jusb-0.4.4-r1.ebuild | 76 ---------------------------
14 dev-java/jusb/metadata.xml | 11 ----
15 profiles/package.mask | 5 --
16 6 files changed, 128 deletions(-)
17
18 diff --git a/dev-java/jusb/Manifest b/dev-java/jusb/Manifest
19 deleted file mode 100644
20 index 8d92219610e..00000000000
21 --- a/dev-java/jusb/Manifest
22 +++ /dev/null
23 @@ -1 +0,0 @@
24 -DIST jusb-0.4.4-src.tgz 92432 SHA256 42782637e3cf190bb4bdf46cd16f827976766ca23d7ef737ac3ed7b11fa0d393 SHA512 a071de83de85fee9f7064cece4cc26ad310ccc1d95cae937cbcc826629f670485f10d36494eb8f31fa7a93727a76573cf82305f3f027ad32e18eda4ac4585995 WHIRLPOOL e59b325a05f2d3567b31e364a0f7cb1c054fa802c70644a521a3f1a2e26eaf86f1b60960e543f667962ff30d4b67b497b126aa1700bed2bfeb38910d9de515c1
25
26 diff --git a/dev-java/jusb/files/jusb-0.4.4-makefile.patch b/dev-java/jusb/files/jusb-0.4.4-makefile.patch
27 deleted file mode 100644
28 index 70d9b4ca4fc..00000000000
29 --- a/dev-java/jusb/files/jusb-0.4.4-makefile.patch
30 +++ /dev/null
31 @@ -1,15 +0,0 @@
32 ---- Makefile.old 2005-04-17 21:50:21.384681513 +0300
33 -+++ Makefile 2005-04-17 21:51:26.854632179 +0300
34 -@@ -292,11 +292,7 @@
35 - # Native compiles
36 - #
37 -
38 --# using nonstandard kernel?
39 --KERNEL_INC ?= /home/src/linux/include
40 --INCLUDES = -I$(KERNEL_INC)
41 --
42 --CFLAGS = -g -O $(INCLUDES) $(RPM_OPT_FLAGS)
43 -+CFLAGS += -g -O $(RPM_OPT_FLAGS)
44 -
45 -
46 - native: $(NATIVE)
47
48 diff --git a/dev-java/jusb/files/jusb-0.4.4-native.patch b/dev-java/jusb/files/jusb-0.4.4-native.patch
49 deleted file mode 100644
50 index b583569d86e..00000000000
51 --- a/dev-java/jusb/files/jusb-0.4.4-native.patch
52 +++ /dev/null
53 @@ -1,20 +0,0 @@
54 -diff -u native.old/linux.c native/linux.c
55 ---- native.old/linux.c 2005-04-17 21:43:13.491277758 +0300
56 -+++ native/linux.c 2005-04-17 21:43:21.986973753 +0300
57 -@@ -226,11 +226,11 @@
58 - } else
59 - buffer = NULL;
60 -
61 -- ctrl.requesttype = requestType;
62 -- ctrl.request = request;
63 -- ctrl.value = value;
64 -- ctrl.index = index;
65 -- ctrl.length = len & 0xffff;
66 -+ ctrl.bRequestType = requestType;
67 -+ ctrl.bRequest = request;
68 -+ ctrl.wValue = value;
69 -+ ctrl.wIndex = index;
70 -+ ctrl.wLength = len & 0xffff;
71 - ctrl.timeout = TIMEOUT; // USB should t/o after 5 seconds.
72 - ctrl.data = buffer + off;
73 - if ((retval = ioctl (fd, USBDEVFS_CONTROL, &ctrl)) < 0)
74
75 diff --git a/dev-java/jusb/jusb-0.4.4-r1.ebuild b/dev-java/jusb/jusb-0.4.4-r1.ebuild
76 deleted file mode 100644
77 index 08e426ae666..00000000000
78 --- a/dev-java/jusb/jusb-0.4.4-r1.ebuild
79 +++ /dev/null
80 @@ -1,76 +0,0 @@
81 -# Copyright 1999-2011 Gentoo Foundation
82 -# Distributed under the terms of the GNU General Public License v2
83 -
84 -inherit eutils java-pkg-2 linux-info flag-o-matic multilib
85 -
86 -DESCRIPTION="jUSB provides a Free Software Java API for USB"
87 -HOMEPAGE="http://jusb.sourceforge.net/"
88 -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
89 -
90 -LICENSE="LGPL-2.1"
91 -SLOT="0"
92 -KEYWORDS="~amd64 ~x86"
93 -IUSE="doc source"
94 -
95 -DEPEND=">=virtual/jdk-1.4
96 - source? ( app-arch/zip )"
97 -RDEPEND=">=virtual/jre-1.4"
98 -
99 -S=${WORKDIR}
100 -
101 -CONFIG_CHECK="~USB_DEVICEFS"
102 -
103 -ERROR_CONFIG_USB_DEVICEFS="
104 -You need to turn on the USB device filesystem
105 -option under USB support in order to use jUSB
106 -"
107 -
108 -pkg_setup() {
109 - linux-info_pkg_setup
110 - java-pkg-2_pkg_setup
111 -}
112 -
113 -src_unpack() {
114 - unpack ${A}
115 -
116 - mkdir src
117 - tar -xzf src.tgz -C src
118 -
119 - # The struct usbdevfs_ctrltransfer is different
120 - # in latest 2.4 and 2.6 kernels. This patch is
121 - # to make jusb compile on 2.6 kernels
122 - ! kernel_is 2 4 && epatch "${FILESDIR}"/${P}-native.patch
123 -
124 - epatch "${FILESDIR}"/${P}-makefile.patch
125 -
126 - sed -i \
127 - -e 's#-shared#-shared -Wl,-soname=libjusb.so#' \
128 - -e 's#javac#javac $(JAVACFLAGS)#' \
129 - "${S}/Makefile" || die "sed failed"
130 -}
131 -
132 -src_compile() {
133 - export OSTYPE="linux-gnu"
134 -
135 - # makefile patching isnt worth the trouble, only
136 - # one native source file
137 - append-flags -fPIC
138 -
139 - # bug #279088
140 - emake -j1 || die "Failed to compile"
141 - use doc && make javadoc
142 -}
143 -
144 -src_install() {
145 - java-pkg_dojar jusb.jar
146 - java-pkg_sointo /usr/$(get_libdir)
147 - java-pkg_doso libjusb.so
148 -
149 - dodoc README*
150 -
151 - if use doc; then
152 - java-pkg_dohtml doc/*.html
153 - java-pkg_dohtml -r apidoc/*
154 - fi
155 - use source && java-pkg_dosrc src/*
156 -}
157
158 diff --git a/dev-java/jusb/metadata.xml b/dev-java/jusb/metadata.xml
159 deleted file mode 100644
160 index 426cf6ffcfc..00000000000
161 --- a/dev-java/jusb/metadata.xml
162 +++ /dev/null
163 @@ -1,11 +0,0 @@
164 -<?xml version="1.0" encoding="UTF-8"?>
165 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
166 -<pkgmetadata>
167 - <maintainer type="project">
168 - <email>java@g.o</email>
169 - <name>Java</name>
170 - </maintainer>
171 - <upstream>
172 - <remote-id type="sourceforge">jusb</remote-id>
173 - </upstream>
174 -</pkgmetadata>
175
176 diff --git a/profiles/package.mask b/profiles/package.mask
177 index 55de96e14bb..672bf5f44f1 100644
178 --- a/profiles/package.mask
179 +++ b/profiles/package.mask
180 @@ -222,11 +222,6 @@ dev-perl/Mail-SpamAssassin-Plugin-GoogleSafeBrowsing
181 # Removal in 30 days. Bug 599710.
182 dev-libs/btparse
183
184 -# Patrice Clement <monsieurp@g.o> (11 Mar 2017)
185 -# Upstream dead: no update since 2003. Ebuild is outdated and buggy.
186 -# Removal in 30 days. Bug #279088
187 -dev-java/jusb
188 -
189 # Gnome Team <gnome@g.o> (08 Mar 2017)
190 # GNOME 3.24 mask (#611270)
191 >=x11-themes/adwaita-icon-theme-3.23