* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/, x11-misc/spnavcfg/files/
@ 2017-01-18 17:50 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2017-01-18 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 1385a65b7352e811ac8878a1618b0fee2d58915b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 17:50:18 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 17:50:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1385a65b
x11-misc/spnavcfg: 0.3 (bug #606430)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/spnavcfg/Manifest | 1 +
.../spnavcfg/files/spnavcfg-0.3-custom-flags.patch | 60 ++++++++++++++++++++++
x11-misc/spnavcfg/spnavcfg-0.3.ebuild | 35 +++++++++++++
3 files changed, 96 insertions(+)
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 1fd31f0..3b1e5b8 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1 +1,2 @@
DIST spnavcfg-0.2.1.tar.gz 18717 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1 SHA512 8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34 WHIRLPOOL f9d40d173e66fdb022fceaabe3d05ad4f088a3e9afdb1c3f27933409682d699d67346a16dcb6fb3736e133c1a341952cdc6b6aafe3734a91c33881b11b2b3dbb
+DIST spnavcfg-0.3.tar.gz 214774 SHA256 4c950b8d4ebd4243c0bf08b6c5922f81b8cf73ec6bb7b20acb390610cdea4bd7 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 WHIRLPOOL 13f677743dd2eed35f57ca178d8b1a9d3382ab1eb586d99b6ff33be0f080e88d80eabd91065db7c48d0ba7bff40eaf8c7d2d0fdc52f85256adb84cc6b4ef6b83
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
new file mode 100644
index 00000000..d0ef0db
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
@@ -0,0 +1,60 @@
+From e994e67a6a5c4722bdc8140528a4dd258c785402 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 18 Jan 2017 18:45:11 +0100
+Subject: [PATCH] Respect custom CFLAGS/LDFLAGS
+
+Based on spnavcfg-0.2.1-custom-flags.patch
+---
+ Makefile.in | 4 ++--
+ configure | 13 +++++++++++++
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 06f23a6..296dd5d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,8 +7,8 @@ warn = -Wall
+ CC = gcc
+ SED = sed
+ INSTALL = install
+-CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
+-LDFLAGS = `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
++CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
++LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
+
+ $(bin): $(obj)
+ $(CC) -o $@ $(obj) $(LDFLAGS)
+diff --git a/configure b/configure
+index e211d92..0fed776 100755
+--- a/configure
++++ b/configure
+@@ -43,6 +43,12 @@ done
+ echo " prefix: $PREFIX"
+ echo " optimize for speed: $OPT"
+ echo " include debugging symbols: $DBG"
++if [ -n "$CFLAGS" ]; then
++ echo " cflags: $CFLAGS"
++fi
++if [ -n "$LDFLAGS" ]; then
++ echo " ldflags: $LDFLAGS"
++fi
+ echo
+
+ # create Makefile
+@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
+ echo 'opt = -O3' >>Makefile
+ fi
+
++if [ -n "$CFLAGS" ]; then
++ echo "user_cflags = $CFLAGS" >>Makefile
++fi
++if [ -n "$LDFLAGS" ]; then
++ echo "user_ldflags = $LDFLAGS" >>Makefile
++fi
++
+ cat "$srcdir/Makefile.in" >>Makefile
+
+ echo ''
+--
+2.11.0
+
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
new file mode 100644
index 00000000..62c0ff4
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GTK-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+ app-misc/spacenavd[X]"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-custom-flags.patch
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) || die "Make failed."
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "Install failed"
+ dodoc README || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/, x11-misc/spnavcfg/files/
@ 2017-02-06 8:09 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-02-06 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 0238927474fb9be94837f224ac107a370c4f4866
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb 6 06:43:03 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 08:09:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02389274
x11-misc/spnavcfg: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3835
x11-misc/spnavcfg/Manifest | 1 -
.../files/spnavcfg-0.2.1-custom-flags.patch | 44 ----------------------
.../spnavcfg/files/spnavcfg-0.2.1-destdir.patch | 16 --------
.../spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch | 12 ------
x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild | 37 ------------------
5 files changed, 110 deletions(-)
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 3b1e5b8..db82881 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,2 +1 @@
-DIST spnavcfg-0.2.1.tar.gz 18717 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1 SHA512 8cda7e8c9c2aa0875c6cf19e96ec47b9492acdcb110e9845f278ede44bee733876a56e2aa2d1198f54d8fecb978fcfe0a61e8f7b7fe19c2754eceec957172e34 WHIRLPOOL f9d40d173e66fdb022fceaabe3d05ad4f088a3e9afdb1c3f27933409682d699d67346a16dcb6fb3736e133c1a341952cdc6b6aafe3734a91c33881b11b2b3dbb
DIST spnavcfg-0.3.tar.gz 214774 SHA256 4c950b8d4ebd4243c0bf08b6c5922f81b8cf73ec6bb7b20acb390610cdea4bd7 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80 WHIRLPOOL 13f677743dd2eed35f57ca178d8b1a9d3382ab1eb586d99b6ff33be0f080e88d80eabd91065db7c48d0ba7bff40eaf8c7d2d0fdc52f85256adb84cc6b4ef6b83
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
deleted file mode 100644
index 5e4c788..00000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:16:40.789374658 +0100
-+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:17:01.146374359 +0100
-@@ -5,8 +5,8 @@ warn = -Wall -Wno-int-to-pointer-cast -W
-
- CC = gcc
- INSTALL = install
--CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0`
--LDFLAGS = `pkg-config --libs gtk+-2.0`
-+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
-+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
-
- $(bin): $(obj)
- $(CC) -o $@ $(obj) $(LDFLAGS)
-diff -Npur spnavcfg-0.2.1.orig/configure spnavcfg-0.2.1/configure
---- spnavcfg-0.2.1.orig/configure 2012-01-31 22:16:40.789374658 +0100
-+++ spnavcfg-0.2.1/configure 2012-01-31 22:17:01.146374359 +0100
-@@ -43,6 +43,12 @@ done
- echo " prefix: $PREFIX"
- echo " optimize for speed: $OPT"
- echo " include debugging symbols: $DBG"
-+if [ -n "$CFLAGS" ]; then
-+ echo " cflags: $CFLAGS"
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+ echo " ldflags: $LDFLAGS"
-+fi
- echo
-
- # create Makefile
-@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
- echo 'opt = -O3' >>Makefile
- fi
-
-+if [ -n "$CFLAGS" ]; then
-+ echo "user_cflags = $CFLAGS" >>Makefile
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+ echo "user_ldflags = $LDFLAGS" >>Makefile
-+fi
-+
- cat "$srcdir/Makefile.in" >>Makefile
-
- echo ''
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
deleted file mode 100644
index 8e6848b..00000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-24 19:50:04.738222230 +0100
-+++ spnavcfg-0.2.1/Makefile.in 2012-01-24 19:51:13.199221053 +0100
-@@ -20,9 +20,9 @@ clean:
-
- .PHONY: install
- install:
-- $(INSTALL) -d $(PREFIX)/bin
-- $(INSTALL) -m 4775 $(bin) $(PREFIX)/bin/$(bin)
-+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
-+ $(INSTALL) -m 4775 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin)
-
- .PHONY: uninstall
- uninstall:
-- rm -f $(PREFIX)/bin/$(bin)
-+ rm -f $(DESTDIR)$(PREFIX)/bin/$(bin)
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
deleted file mode 100644
index 7294013..00000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Npur spnavcfg-0.2.1.orig/Makefile.in spnavcfg-0.2.1/Makefile.in
---- spnavcfg-0.2.1.orig/Makefile.in 2012-01-31 22:10:35.832381151 +0100
-+++ spnavcfg-0.2.1/Makefile.in 2012-01-31 22:11:14.254380520 +0100
-@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W
- CC = gcc
- INSTALL = install
- CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0`
--LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0`
-+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0` -lX11
-
- $(bin): $(obj)
- $(CC) -o $@ $(obj) $(LDFLAGS)
diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
deleted file mode 100644
index d1fb9af..00000000
--- a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="GTK-based GUI to configure a space navigator device"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- app-misc/spacenavd[X]"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-destdir.patch
- epatch "${FILESDIR}"/${P}-custom-flags.patch
- epatch "${FILESDIR}"/${P}-x11-libs.patch
-}
-
-src_compile() {
- emake CC=$(tc-getCC) || die "Make failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
- dodoc README || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/, x11-misc/spnavcfg/files/
@ 2021-03-13 13:47 Sebastian Pipping
0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2021-03-13 13:47 UTC (permalink / raw
To: gentoo-commits
commit: caedbf4de602b5c5ba7e558f0d2165a19a67d847
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 13:46:10 2021 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 13:46:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caedbf4d
x11-misc/spnavcfg: Drop old (EAPI 6)
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.17, Repoman-3.0.2
x11-misc/spnavcfg/Manifest | 1 -
.../spnavcfg/files/spnavcfg-0.3-custom-flags.patch | 60 ----------------------
x11-misc/spnavcfg/spnavcfg-0.3.ebuild | 27 ----------
3 files changed, 88 deletions(-)
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 5ca4eeab33d..37c190bfda1 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,2 +1 @@
DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
-DIST spnavcfg-0.3.tar.gz 214774 BLAKE2B aee45a796bd95761e4a7fe922cc5b65185c894e2fa366dea6d7677fc5ac3b7e0345b89eedef7bf8e446c598d66f161bb66fa695c07b433f5a6b7dce5055b6256 SHA512 a3411c32a6c7de2fd1cfa7960e1b0dade88e8c37435a39ded864b4b6f12fd3c8f518dad7a4ac5b465517484e74b3586f12d47e780f655fd7e4c3fea8d6186c80
diff --git a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch b/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
deleted file mode 100644
index d0ef0db6e71..00000000000
--- a/x11-misc/spnavcfg/files/spnavcfg-0.3-custom-flags.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From e994e67a6a5c4722bdc8140528a4dd258c785402 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 18 Jan 2017 18:45:11 +0100
-Subject: [PATCH] Respect custom CFLAGS/LDFLAGS
-
-Based on spnavcfg-0.2.1-custom-flags.patch
----
- Makefile.in | 4 ++--
- configure | 13 +++++++++++++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 06f23a6..296dd5d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -7,8 +7,8 @@ warn = -Wall
- CC = gcc
- SED = sed
- INSTALL = install
--CFLAGS = -pedantic $(warn) $(dbg) $(opt) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
--LDFLAGS = `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
-+CFLAGS = $(user_cflags) `pkg-config --cflags gtk+-2.0 gmodule-export-2.0`
-+LDFLAGS = $(user_ldflags) `pkg-config --libs gtk+-2.0 gmodule-export-2.0` -lX11
-
- $(bin): $(obj)
- $(CC) -o $@ $(obj) $(LDFLAGS)
-diff --git a/configure b/configure
-index e211d92..0fed776 100755
---- a/configure
-+++ b/configure
-@@ -43,6 +43,12 @@ done
- echo " prefix: $PREFIX"
- echo " optimize for speed: $OPT"
- echo " include debugging symbols: $DBG"
-+if [ -n "$CFLAGS" ]; then
-+ echo " cflags: $CFLAGS"
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+ echo " ldflags: $LDFLAGS"
-+fi
- echo
-
- # create Makefile
-@@ -58,6 +64,13 @@ if [ "$OPT" = 'yes' ]; then
- echo 'opt = -O3' >>Makefile
- fi
-
-+if [ -n "$CFLAGS" ]; then
-+ echo "user_cflags = $CFLAGS" >>Makefile
-+fi
-+if [ -n "$LDFLAGS" ]; then
-+ echo "user_ldflags = $LDFLAGS" >>Makefile
-+fi
-+
- cat "$srcdir/Makefile.in" >>Makefile
-
- echo ''
---
-2.11.0
-
diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
deleted file mode 100644
index 20345a3947a..00000000000
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="GTK-based GUI to configure a space navigator device"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- app-misc/spacenavd[X]"
-
-PATCHES=( "${FILESDIR}"/${P}-custom-flags.patch )
-
-src_compile() {
- emake CC=$(tc-getCC)
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-13 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-13 13:47 [gentoo-commits] repo/gentoo:master commit in: x11-misc/spnavcfg/, x11-misc/spnavcfg/files/ Sebastian Pipping
-- strict thread matches above, loose matches on Subject: below --
2017-02-06 8:09 David Seifert
2017-01-18 17:50 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox