Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/, x11-misc/spnavcfg/files/
Date: Mon, 06 Feb 2017 08:09:56
Message-Id: 1486368551.0238927474fb9be94837f224ac107a370c4f4866.soap@gentoo
1 commit: 0238927474fb9be94837f224ac107a370c4f4866
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 6 06:43:03 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 6 08:09:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02389274
7
8 x11-misc/spnavcfg: Drop old
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/3835
12
13 x11-misc/spnavcfg/Manifest | 1 -
14 .../files/spnavcfg-0.2.1-custom-flags.patch | 44 ----------------------
15 .../spnavcfg/files/spnavcfg-0.2.1-destdir.patch | 16 --------
16 .../spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch | 12 ------
17 x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild | 37 ------------------
18 5 files changed, 110 deletions(-)
19
20 diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
21 index 3b1e5b8..db82881 100644
22 --- a/x11-misc/spnavcfg/Manifest
23 +++ b/x11-misc/spnavcfg/Manifest
24 @@ -1,2 +1 @@
25 -DIST spnavcfg-0.2.1.tar.gz 18717 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1 SHA512 8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34 WHIRLPOOL f9d40d173e66fdb022fceaabe3d05ad4f088a3e9afdb1c3f27933409682d699d67346a16dcb6fb3736e133c1a341952cdc6b6aafe3734a91c33881b11b2b3dbb
26 DIST spnavcfg-0.3.tar.gz 214774 SHA256 4c950b8d4ebd4243c0bf08b6c5922f81b8cf73ec6bb7b20acb390610cdea4bd7 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 WHIRLPOOL 13f677743dd2eed35f57ca178d8b1a9d3382ab1eb586d99b6ff33be0f080e88d80eabd91065db7c48d0ba7bff40eaf8c7d2d0fdc52f85256adb84cc6b4ef6b83
27
28 diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
29 deleted file mode 100644
30 index 5e4c788..00000000
31 --- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
32 +++ /dev/null
33 @@ -1,44 +0,0 @@
34 -diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
35 ---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:16:40.789374658 +0100
36 -+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:17:01.146374359 +0100
37 -@@ -5,8 +5,8 @@ warn = -Wall -Wno-int-to-pointer-cast -W
38 -
39 - CC = gcc
40 - INSTALL = install
41 --CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0`
42 --LDFLAGS = `pkg-config --libs gtk+-2.0`
43 -+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
44 -+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
45 -
46 - $(bin): $(obj)
47 - $(CC) -o $@ $(obj) $(LDFLAGS)
48 -diff -Npur spnavcfg-0.2.1.orig/configure spnavcfg-0.2.1/configure
49 ---- spnavcfg-0.2.1.orig/configure 2012-01-31 22:16:40.789374658 +0100
50 -+++ spnavcfg-0.2.1/configure 2012-01-31 22:17:01.146374359 +0100
51 -@@ -43,6 +43,12 @@ done
52 - echo " prefix: $PREFIX"
53 - echo " optimize for speed: $OPT"
54 - echo " include debugging symbols: $DBG"
55 -+if [ -n "$CFLAGS" ]; then
56 -+ echo " cflags: $CFLAGS"
57 -+fi
58 -+if [ -n "$LDFLAGS" ]; then
59 -+ echo " ldflags: $LDFLAGS"
60 -+fi
61 - echo
62 -
63 - # create Makefile
64 -@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
65 - echo 'opt = -O3' >>Makefile
66 - fi
67 -
68 -+if [ -n "$CFLAGS" ]; then
69 -+ echo "user_cflags = $CFLAGS" >>Makefile
70 -+fi
71 -+if [ -n "$LDFLAGS" ]; then
72 -+ echo "user_ldflags = $LDFLAGS" >>Makefile
73 -+fi
74 -+
75 - cat "$srcdir/Makefile.in" >>Makefile
76 -
77 - echo ''
78
79 diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
80 deleted file mode 100644
81 index 8e6848b..00000000
82 --- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
83 +++ /dev/null
84 @@ -1,16 +0,0 @@
85 -diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
86 ---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-24 19:50:04.738222230 +0100
87 -+++ spnavcfg-0.2.1/Makefile.in 2012-01-24 19:51:13.199221053 +0100
88 -@@ -20,9 +20,9 @@ clean:
89 -
90 - .PHONY: install
91 - install:
92 -- $(INSTALL) -d $(PREFIX)/bin
93 -- $(INSTALL) -m 4775 $(bin) $(PREFIX)/bin/$(bin)
94 -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
95 -+ $(INSTALL) -m 4775 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
96 -
97 - .PHONY: uninstall
98 - uninstall:
99 -- rm -f $(PREFIX)/bin/$(bin)
100 -+ rm -f $(DESTDIR)$(PREFIX)/bin/$(bin)
101
102 diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
103 deleted file mode 100644
104 index 7294013..00000000
105 --- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
106 +++ /dev/null
107 @@ -1,12 +0,0 @@
108 -diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
109 ---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:10:35.832381151 +0100
110 -+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:11:14.254380520 +0100
111 -@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W
112 - CC = gcc
113 - INSTALL = install
114 - CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
115 --LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
116 -+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` -lX11
117 -
118 - $(bin): $(obj)
119 - $(CC) -o $@ $(obj) $(LDFLAGS)
120
121 diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
122 deleted file mode 100644
123 index d1fb9af..00000000
124 --- a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
125 +++ /dev/null
126 @@ -1,37 +0,0 @@
127 -# Copyright 1999-2012 Gentoo Foundation
128 -# Distributed under the terms of the GNU General Public License v2
129 -# $Id$
130 -
131 -EAPI="3"
132 -
133 -inherit eutils toolchain-funcs
134 -
135 -DESCRIPTION="GTK-based GUI to configure a space navigator device"
136 -HOMEPAGE="http://spacenav.sourceforge.net/"
137 -SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
138 -
139 -LICENSE="GPL-3"
140 -SLOT="0"
141 -KEYWORDS="~amd64 ~x86"
142 -IUSE=""
143 -
144 -COMMON_DEPEND="x11-libs/gtk+:2"
145 -DEPEND="${COMMON_DEPEND}
146 - virtual/pkgconfig"
147 -RDEPEND="${COMMON_DEPEND}
148 - app-misc/spacenavd[X]"
149 -
150 -src_prepare() {
151 - epatch "${FILESDIR}"/${P}-destdir.patch
152 - epatch "${FILESDIR}"/${P}-custom-flags.patch
153 - epatch "${FILESDIR}"/${P}-x11-libs.patch
154 -}
155 -
156 -src_compile() {
157 - emake CC=$(tc-getCC) || die "Make failed."
158 -}
159 -
160 -src_install() {
161 - emake DESTDIR="${D}" install || die "Install failed"
162 - dodoc README || die
163 -}