From 8ab342e7180e6a187e11b08547140c55b23ccf16 Mon Sep 17 00:00:00 2001 From: Anthoine Bourgeois Date: Wed, 1 Feb 2012 14:07:56 +0100 Subject: Move spacenavd from sys-libs to app-misc category --- app-misc/spacenavd/ChangeLog | 13 ++++ app-misc/spacenavd/Manifest | 8 +++ .../files/spacenavd-0.5-custom-flags.patch | 67 +++++++++++++++++++++ .../spacenavd/files/spacenavd-0.5-destdir.patch | 16 +++++ app-misc/spacenavd/files/spnavd | 27 +++++++++ app-misc/spacenavd/metadata.xml | 22 +++++++ app-misc/spacenavd/spacenavd-0.5-r1.ebuild | 69 ++++++++++++++++++++++ app-misc/spacenavd/spacenavd-0.5.ebuild | 64 ++++++++++++++++++++ media-libs/libspnav/Manifest | 2 +- media-libs/libspnav/libspnav-0.2.2.ebuild | 2 +- sys-libs/spacenavd/ChangeLog | 13 ---- sys-libs/spacenavd/Manifest | 8 --- .../files/spacenavd-0.5-custom-flags.patch | 67 --------------------- .../spacenavd/files/spacenavd-0.5-destdir.patch | 16 ----- sys-libs/spacenavd/files/spnavd | 27 --------- sys-libs/spacenavd/metadata.xml | 22 ------- sys-libs/spacenavd/spacenavd-0.5-r1.ebuild | 69 ---------------------- sys-libs/spacenavd/spacenavd-0.5.ebuild | 64 -------------------- x11-misc/spnavcfg/Manifest | 2 +- x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild | 2 +- 20 files changed, 290 insertions(+), 290 deletions(-) create mode 100644 app-misc/spacenavd/ChangeLog create mode 100644 app-misc/spacenavd/Manifest create mode 100644 app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch create mode 100644 app-misc/spacenavd/files/spacenavd-0.5-destdir.patch create mode 100644 app-misc/spacenavd/files/spnavd create mode 100644 app-misc/spacenavd/metadata.xml create mode 100644 app-misc/spacenavd/spacenavd-0.5-r1.ebuild create mode 100644 app-misc/spacenavd/spacenavd-0.5.ebuild delete mode 100644 sys-libs/spacenavd/ChangeLog delete mode 100644 sys-libs/spacenavd/Manifest delete mode 100644 sys-libs/spacenavd/files/spacenavd-0.5-custom-flags.patch delete mode 100644 sys-libs/spacenavd/files/spacenavd-0.5-destdir.patch delete mode 100644 sys-libs/spacenavd/files/spnavd delete mode 100644 sys-libs/spacenavd/metadata.xml delete mode 100644 sys-libs/spacenavd/spacenavd-0.5-r1.ebuild delete mode 100644 sys-libs/spacenavd/spacenavd-0.5.ebuild diff --git a/app-misc/spacenavd/ChangeLog b/app-misc/spacenavd/ChangeLog new file mode 100644 index 0000000..25bbc05 --- /dev/null +++ b/app-misc/spacenavd/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for sys-libs/spacenavd +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*spacenavd-0.5-r1 (24 Jan 2012) + + 24 Jan 2012; Sebastian Pipping +spacenavd-0.5-r1.ebuild, + files/spnavd: + Do not pass unknown parameter --system to spacenavd in init script, install + config sample to /etc/spnavrc.sample rather than /etc/conf.d/spnavrc so the + app finds it, rename daemon from spnavd to spacenavd, use dobin rather than + doexe, fix information presented in pkg_postinst + diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest new file mode 100644 index 0000000..9a5847a --- /dev/null +++ b/app-misc/spacenavd/Manifest @@ -0,0 +1,8 @@ +AUX spacenavd-0.5-custom-flags.patch 2008 RMD160 c665becac1ff1b31eec94fe3ef70b98f851a2488 SHA1 79909d72d9da7ff0af369685869bb6709edadc90 SHA256 78c8aebbd33f0c135501e6dea132c4f6edd9068bfddf741bfc8fe11d5269f546 +AUX spacenavd-0.5-destdir.patch 649 RMD160 3ffb705f3a0a2a940e4e4a9c3d34c3ede6c95f33 SHA1 8a946d85a1d8d454579e635c2248bc17dc1a399d SHA256 df58f5006d3b1be15a40182ca91ea964d62572a6e0a47b05c037958674db5366 +AUX spnavd 579 RMD160 13e324d36ffb8900eb672492b7d8e10ae6a6c718 SHA1 dbef423d85a95f9fc329cfa379256a7331bdd7ac SHA256 2ad811c9c2de7ffa054e22a3d1a8c597b0a1cdc9fda719a7cc94a4fd8ca7ad42 +DIST spacenavd-0.5.tar.gz 41746 RMD160 7b455d4cd96074707e671103e45cd0a5423cafc3 SHA1 76438d6fce981337b272210311124fe711606235 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3 +EBUILD spacenavd-0.5-r1.ebuild 1650 RMD160 047941cc56ea478c5be9d9471814a7786b3638d3 SHA1 065ae11a2c2c21dc399eb5149062a0f90f1f5081 SHA256 7921536c6454498500cffe276854df5d45e14dcdbb3a2dab1da75bc571173576 +EBUILD spacenavd-0.5.ebuild 1594 RMD160 fbd2872cd45c6194d4ac30b8375ad879b187a5d9 SHA1 39849f999add92b5093a562cad7a55ecced39112 SHA256 37552d30d3d46827977c4862bfe0ae06ba2472dbfe77bbd1ee2a5770e01bcef3 +MISC ChangeLog 532 RMD160 40283a589c74966036c94ff1001670e500932c2e SHA1 2dd00fcc3cbaddae1407c4701c70ac3297ca48c3 SHA256 9c4a842847ca2907189d23efe3a0442ec9d909d8d48d447604e68d7b79c70f4a +MISC metadata.xml 843 RMD160 4e1c3eaba52e4bf6288364151cf6159b12b195cd SHA1 098de8c59b5b3f7e721df2067a7762e8914bd34d SHA256 40d478c2563fec01498586ee132dd94f6c9c7acef0ada92812f8bdbe73dd7f21 diff --git a/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch new file mode 100644 index 0000000..3b834a4 --- /dev/null +++ b/app-misc/spacenavd/files/spacenavd-0.5-custom-flags.patch @@ -0,0 +1,67 @@ +diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in +--- spacenavd-0.5.orig/Makefile.in 2012-01-31 22:22:20.460368687 +0100 ++++ spacenavd-0.5/Makefile.in 2012-01-31 22:23:18.170367675 +0100 +@@ -6,8 +6,8 @@ ctl = spnavd_ctl + + CC = gcc + INSTALL = install +-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src +-LDFLAGS = $(xlib) ++CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src ++LDFLAGS = $(ldopt) $(xlib) + + $(bin): $(obj) + $(CC) -o $@ $(obj) $(LDFLAGS) +diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure +--- spacenavd-0.5.orig/configure 2012-01-31 22:22:20.460368687 +0100 ++++ spacenavd-0.5/configure 2012-01-31 22:22:49.257368187 +0100 +@@ -28,6 +28,7 @@ test_kver() { + + PREFIX=/usr/local + OPT=yes ++LDOPT=yes + DBG=yes + X11=yes + HOTPLUG=yes +@@ -70,6 +71,11 @@ for arg; do + --disable-opt) + OPT=no;; + ++ --enable-ldopt) ++ LDOPT=yes;; ++ --disable-ldopt) ++ LDOPT=no;; ++ + --enable-debug) + DBG=yes;; + --disable-debug) +@@ -95,6 +101,8 @@ for arg; do + echo ' --disable-hotplug: disable hotplug, fallback to polling for the device' + echo ' --enable-opt: enable speed optimizations (default)' + echo ' --disable-opt: disable speed optimizations' ++ echo ' --enable-ldopt: enable link optimizations (default)' ++ echo ' --disable-ldopt: disable link optimizations' + echo ' --enable-debug: include debugging symbols (default)' + echo ' --disable-debug: do not include debugging symbols' + echo 'all invalid options are silently ignored' +@@ -105,6 +113,7 @@ done + + echo " prefix: $PREFIX" + echo " optimize for speed: $OPT" ++echo " optimize link: $LDOPT" + echo " include debugging symbols: $DBG" + echo " x11 communication method: $X11" + echo " use hotplug: $HOTPLUG" +@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then + fi + + if [ "$OPT" = 'yes' ]; then +- echo 'opt = -O3' >>Makefile ++ echo "opt = ${CFLAGS:--O3}" >>Makefile ++fi ++ ++if [ "$LDOPT" = 'yes' ]; then ++ echo "ldopt = ${LDFLAGS}" >>Makefile + fi + + if [ "$X11" = 'yes' ]; then diff --git a/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch new file mode 100644 index 0000000..5b23722 --- /dev/null +++ b/app-misc/spacenavd/files/spacenavd-0.5-destdir.patch @@ -0,0 +1,16 @@ +diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in +--- spacenavd-0.5.orig/Makefile.in 2011-11-16 21:43:53.210859753 +0100 ++++ spacenavd-0.5/Makefile.in 2011-11-16 21:45:36.386857932 +0100 +@@ -24,9 +24,9 @@ clean: + + .PHONY: install + install: $(bin) +- $(INSTALL) -d $(PREFIX)/bin +- $(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin) +- $(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl) ++ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin ++ $(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin) ++ $(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl) + cd $(srcdir) && ./setup_init --no-install + + # [ -d /etc/hal/fdi/policy ] && \ diff --git a/app-misc/spacenavd/files/spnavd b/app-misc/spacenavd/files/spnavd new file mode 100644 index 0000000..383a2ad --- /dev/null +++ b/app-misc/spacenavd/files/spnavd @@ -0,0 +1,27 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need localmount + after bootmisc +} + +start() { + ebegin "Starting Spacenav system daemon" + + start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd + eend $? +} + +stop() { + local retval + + ebegin "Stopping Spacenav system daemon" + + start-stop-daemon --stop --pidfile /var/run/spnavd.pid + retval=$? + + eend ${retval} + return ${retval} +} diff --git a/app-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml new file mode 100644 index 0000000..11a8f95 --- /dev/null +++ b/app-misc/spacenavd/metadata.xml @@ -0,0 +1,22 @@ + + + + no-herd + + anthoine.bourgeois@gmail.com + Anthoine Bourgeois + + + sping@gentoo.org + Sebastian Pipping + + + The spacenavd daemon can be used directly as a drop-in replacement + to the 3DxWare daemon. It can communicate with the official magellan + SDK, and thus any program compiled with it can work with spacenavd + transparently without any change or need of recompilation. + Also, spacenavd provides an alternative communication protocol, for + programs that use libspnav, that doesn't require an X server, as the + original protocol does. + + diff --git a/app-misc/spacenavd/spacenavd-0.5-r1.ebuild b/app-misc/spacenavd/spacenavd-0.5-r1.ebuild new file mode 100644 index 0000000..19e033b --- /dev/null +++ b/app-misc/spacenavd/spacenavd-0.5-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit eutils linux-info toolchain-funcs + +MY_PN='spacenav' +DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon." +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND="X? ( x11-apps/xdpyinfo )" +DEPEND="${RDEPEND}" + +pkg_setup() { + CONFIG_CHECK="~HOTPLUG" + ERROR_CFG="Your kernel needs HOTPLUG for the spacenavd to work properly" + check_extra_config +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-destdir.patch + epatch "${FILESDIR}"/${P}-custom-flags.patch +} + +src_configure() { + econf \ + --enable-opt --enable-ldopt \ + $(use_enable X x11) +} + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + # Config file + insinto /etc + newins "${S}/doc/example-spnavrc" spnavrc.sample || die + + # Init script + newinitd "${FILESDIR}/spnavd" spacenavd || die + + # Daemon + dobin "${S}/spacenavd" + use X && dobin "${S}/spnavd_ctl" +} + +pkg_postinst() { + elog "To start the Spacenav daemon system-wide by default" + elog "you should add it to the default runlevel :" + elog "\`rc-update add spacenavd default\`" + elog + if use X; then + elog "To start generating Spacenav X events by default" + elog "you should add this command in your user startup" + elog "scripts such as .gnomerc or .xinitrc :" + elog "\`spnavd_ctl x11 start\`" + elog + fi + ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run" + ewarn "the new version of the daemon." +} diff --git a/app-misc/spacenavd/spacenavd-0.5.ebuild b/app-misc/spacenavd/spacenavd-0.5.ebuild new file mode 100644 index 0000000..764bced --- /dev/null +++ b/app-misc/spacenavd/spacenavd-0.5.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" + +inherit eutils linux-info + +DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon." +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/spacenav/files/spacenav%20daemon/spacenavd%20${PV}/${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X debug" + +RDEPEND="X? ( x11-apps/xdpyinfo )" +DEPEND="${RDEPEND}" + +pkg_setup() { + CONFIG_CHECK="~HOTPLUG" + ERROR_CFG="Your kernel needs HOTPLUG for the spacenavd to work properly" + check_extra_config +} +src_prepare() { + epatch "${FILESDIR}"/${P}-destdir.patch + epatch "${FILESDIR}"/${P}-custom-flags.patch +} + +src_configure() { + econf \ + --enable-opt --enable-ldopt \ + $(use_enable X x11) \ + $(use_enable debug) +} + +src_install() { + # Config file + newconfd "${S}/doc/example-spnavrc" spnavrc + + # Init script + newinitd "${FILESDIR}/spnavd" spnavrc + + # Daemon + exeinto /usr/bin + doexe "${S}/spacenavd" + use X && doexe "${S}/spnavd_ctl" +} + +pkg_postinst() { + elog "To start the Spacenav daemon system-wide by default" + elog "you should add it to the default runlevel :" + elog "\`rc-update add spnavd default\`" + elog + if use X; then + elog "To start generating Spacenav X events by default" + elog "you should add this command in your user startup" + elog "scripts such as .gnomerc or .xinitrc :" + elog "\`spnav_ctl x11 start\`" + elog + fi + ewarn "You must restart spnavd \`/etc/init.d/spnavd restart\` to run" + ewarn "the new version of the daemon." +} diff --git a/media-libs/libspnav/Manifest b/media-libs/libspnav/Manifest index 9533563..e67c697 100644 --- a/media-libs/libspnav/Manifest +++ b/media-libs/libspnav/Manifest @@ -1,5 +1,5 @@ AUX libspnav-0.2.2-custom-flags.patch 2151 RMD160 26eccbf34e404defe392333db30f433737220bc6 SHA1 e14d386825db1728261cfb9fbef2e5fd4c480383 SHA256 f3dcc7b4023e67a87a0554cdd277a836696c948b0ec01035ec6fe5dd2e4c587b AUX libspnav-0.2.2-makefile.patch 926 RMD160 7bee7c9d4af64bdafa3178c1565a41f062a96359 SHA1 9c20ac0d0d5c2bb8f60270b0d630bb37594a0596 SHA256 ec3abb5c566b3b4bb3f18e58ff83802845ea9156cba42ed417f4da35733746e7 DIST libspnav-0.2.2.tar.gz 11615 RMD160 d49a1c9b5e556fd8ff8e7545d0983c1b205fe9f2 SHA1 c9291ed4acb38da3be4f81e6e3b43f853ce55eca SHA256 fb72388770d7dcd85b56ac2a83948983f1afd7dbe271e18d507b975ac4bea14f -EBUILD libspnav-0.2.2.ebuild 1137 RMD160 7c285d5a2a26ae8cee89bcd127d43f09d4551c0b SHA1 4c014d8a61cfa1527f66f60ce59b626ee4198b24 SHA256 e97dbf2ce1862385342b787b4e32fe0a5dd4586d3b7b1bb7b76d43529400c565 +EBUILD libspnav-0.2.2.ebuild 1137 RMD160 2eb6836d930dbf9914917397378f09b14f1b921a SHA1 e60621dc9b1c668b9f9ac44d0b544e050ba59e83 SHA256 53cda83930da437ad35816c5d871d5ccdda68ff1977fde830e38d6098fdeb3ec MISC metadata.xml 850 RMD160 ac6b9735dafead0ee2569e89dfad1e2724d69be4 SHA1 b2d86473d5a5f83a72769f9305bf23fbd494eaff SHA256 18379cae8775245952a6107dc6f447b9ab511e58b87a1299d72ada53f1498bf6 diff --git a/media-libs/libspnav/libspnav-0.2.2.ebuild b/media-libs/libspnav/libspnav-0.2.2.ebuild index c3aaa0c..10b7c97 100644 --- a/media-libs/libspnav/libspnav-0.2.2.ebuild +++ b/media-libs/libspnav/libspnav-0.2.2.ebuild @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X" -RDEPEND="X? ( sys-libs/spacenavd[X?] )" +RDEPEND="X? ( app-misc/spacenavd[X?] )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/sys-libs/spacenavd/ChangeLog b/sys-libs/spacenavd/ChangeLog deleted file mode 100644 index 25bbc05..0000000 --- a/sys-libs/spacenavd/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -# ChangeLog for sys-libs/spacenavd -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*spacenavd-0.5-r1 (24 Jan 2012) - - 24 Jan 2012; Sebastian Pipping +spacenavd-0.5-r1.ebuild, - files/spnavd: - Do not pass unknown parameter --system to spacenavd in init script, install - config sample to /etc/spnavrc.sample rather than /etc/conf.d/spnavrc so the - app finds it, rename daemon from spnavd to spacenavd, use dobin rather than - doexe, fix information presented in pkg_postinst - diff --git a/sys-libs/spacenavd/Manifest b/sys-libs/spacenavd/Manifest deleted file mode 100644 index 9a5847a..0000000 --- a/sys-libs/spacenavd/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX spacenavd-0.5-custom-flags.patch 2008 RMD160 c665becac1ff1b31eec94fe3ef70b98f851a2488 SHA1 79909d72d9da7ff0af369685869bb6709edadc90 SHA256 78c8aebbd33f0c135501e6dea132c4f6edd9068bfddf741bfc8fe11d5269f546 -AUX spacenavd-0.5-destdir.patch 649 RMD160 3ffb705f3a0a2a940e4e4a9c3d34c3ede6c95f33 SHA1 8a946d85a1d8d454579e635c2248bc17dc1a399d SHA256 df58f5006d3b1be15a40182ca91ea964d62572a6e0a47b05c037958674db5366 -AUX spnavd 579 RMD160 13e324d36ffb8900eb672492b7d8e10ae6a6c718 SHA1 dbef423d85a95f9fc329cfa379256a7331bdd7ac SHA256 2ad811c9c2de7ffa054e22a3d1a8c597b0a1cdc9fda719a7cc94a4fd8ca7ad42 -DIST spacenavd-0.5.tar.gz 41746 RMD160 7b455d4cd96074707e671103e45cd0a5423cafc3 SHA1 76438d6fce981337b272210311124fe711606235 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3 -EBUILD spacenavd-0.5-r1.ebuild 1650 RMD160 047941cc56ea478c5be9d9471814a7786b3638d3 SHA1 065ae11a2c2c21dc399eb5149062a0f90f1f5081 SHA256 7921536c6454498500cffe276854df5d45e14dcdbb3a2dab1da75bc571173576 -EBUILD spacenavd-0.5.ebuild 1594 RMD160 fbd2872cd45c6194d4ac30b8375ad879b187a5d9 SHA1 39849f999add92b5093a562cad7a55ecced39112 SHA256 37552d30d3d46827977c4862bfe0ae06ba2472dbfe77bbd1ee2a5770e01bcef3 -MISC ChangeLog 532 RMD160 40283a589c74966036c94ff1001670e500932c2e SHA1 2dd00fcc3cbaddae1407c4701c70ac3297ca48c3 SHA256 9c4a842847ca2907189d23efe3a0442ec9d909d8d48d447604e68d7b79c70f4a -MISC metadata.xml 843 RMD160 4e1c3eaba52e4bf6288364151cf6159b12b195cd SHA1 098de8c59b5b3f7e721df2067a7762e8914bd34d SHA256 40d478c2563fec01498586ee132dd94f6c9c7acef0ada92812f8bdbe73dd7f21 diff --git a/sys-libs/spacenavd/files/spacenavd-0.5-custom-flags.patch b/sys-libs/spacenavd/files/spacenavd-0.5-custom-flags.patch deleted file mode 100644 index 3b834a4..0000000 --- a/sys-libs/spacenavd/files/spacenavd-0.5-custom-flags.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in ---- spacenavd-0.5.orig/Makefile.in 2012-01-31 22:22:20.460368687 +0100 -+++ spacenavd-0.5/Makefile.in 2012-01-31 22:23:18.170367675 +0100 -@@ -6,8 +6,8 @@ ctl = spnavd_ctl - - CC = gcc - INSTALL = install --CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src --LDFLAGS = $(xlib) -+CFLAGS = $(opt) -fno-strict-aliasing -I$(srcdir)/src -+LDFLAGS = $(ldopt) $(xlib) - - $(bin): $(obj) - $(CC) -o $@ $(obj) $(LDFLAGS) -diff -Npur spacenavd-0.5.orig/configure spacenavd-0.5/configure ---- spacenavd-0.5.orig/configure 2012-01-31 22:22:20.460368687 +0100 -+++ spacenavd-0.5/configure 2012-01-31 22:22:49.257368187 +0100 -@@ -28,6 +28,7 @@ test_kver() { - - PREFIX=/usr/local - OPT=yes -+LDOPT=yes - DBG=yes - X11=yes - HOTPLUG=yes -@@ -70,6 +71,11 @@ for arg; do - --disable-opt) - OPT=no;; - -+ --enable-ldopt) -+ LDOPT=yes;; -+ --disable-ldopt) -+ LDOPT=no;; -+ - --enable-debug) - DBG=yes;; - --disable-debug) -@@ -95,6 +101,8 @@ for arg; do - echo ' --disable-hotplug: disable hotplug, fallback to polling for the device' - echo ' --enable-opt: enable speed optimizations (default)' - echo ' --disable-opt: disable speed optimizations' -+ echo ' --enable-ldopt: enable link optimizations (default)' -+ echo ' --disable-ldopt: disable link optimizations' - echo ' --enable-debug: include debugging symbols (default)' - echo ' --disable-debug: do not include debugging symbols' - echo 'all invalid options are silently ignored' -@@ -105,6 +113,7 @@ done - - echo " prefix: $PREFIX" - echo " optimize for speed: $OPT" -+echo " optimize link: $LDOPT" - echo " include debugging symbols: $DBG" - echo " x11 communication method: $X11" - echo " use hotplug: $HOTPLUG" -@@ -128,7 +137,11 @@ if [ "$DBG" = 'yes' ]; then - fi - - if [ "$OPT" = 'yes' ]; then -- echo 'opt = -O3' >>Makefile -+ echo "opt = ${CFLAGS:--O3}" >>Makefile -+fi -+ -+if [ "$LDOPT" = 'yes' ]; then -+ echo "ldopt = ${LDFLAGS}" >>Makefile - fi - - if [ "$X11" = 'yes' ]; then diff --git a/sys-libs/spacenavd/files/spacenavd-0.5-destdir.patch b/sys-libs/spacenavd/files/spacenavd-0.5-destdir.patch deleted file mode 100644 index 5b23722..0000000 --- a/sys-libs/spacenavd/files/spacenavd-0.5-destdir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Npur spacenavd-0.5.orig/Makefile.in spacenavd-0.5/Makefile.in ---- spacenavd-0.5.orig/Makefile.in 2011-11-16 21:43:53.210859753 +0100 -+++ spacenavd-0.5/Makefile.in 2011-11-16 21:45:36.386857932 +0100 -@@ -24,9 +24,9 @@ clean: - - .PHONY: install - install: $(bin) -- $(INSTALL) -d $(PREFIX)/bin -- $(INSTALL) -m 755 $(bin) $(PREFIX)/bin/$(bin) -- $(INSTALL) -m 755 $(srcdir)/$(ctl) $(PREFIX)/bin/$(ctl) -+ $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin -+ $(INSTALL) -m 755 $(bin) $(DESTDIR)$(PREFIX)/bin/$(bin) -+ $(INSTALL) -m 755 $(srcdir)/$(ctl) $(DESTDIR)$(PREFIX)/bin/$(ctl) - cd $(srcdir) && ./setup_init --no-install - - # [ -d /etc/hal/fdi/policy ] && \ diff --git a/sys-libs/spacenavd/files/spnavd b/sys-libs/spacenavd/files/spnavd deleted file mode 100644 index 383a2ad..0000000 --- a/sys-libs/spacenavd/files/spnavd +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need localmount - after bootmisc -} - -start() { - ebegin "Starting Spacenav system daemon" - - start-stop-daemon --start --pidfile /var/run/spnavd.pid --exec /usr/bin/spacenavd - eend $? -} - -stop() { - local retval - - ebegin "Stopping Spacenav system daemon" - - start-stop-daemon --stop --pidfile /var/run/spnavd.pid - retval=$? - - eend ${retval} - return ${retval} -} diff --git a/sys-libs/spacenavd/metadata.xml b/sys-libs/spacenavd/metadata.xml deleted file mode 100644 index 11a8f95..0000000 --- a/sys-libs/spacenavd/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - no-herd - - anthoine.bourgeois@gmail.com - Anthoine Bourgeois - - - sping@gentoo.org - Sebastian Pipping - - - The spacenavd daemon can be used directly as a drop-in replacement - to the 3DxWare daemon. It can communicate with the official magellan - SDK, and thus any program compiled with it can work with spacenavd - transparently without any change or need of recompilation. - Also, spacenavd provides an alternative communication protocol, for - programs that use libspnav, that doesn't require an X server, as the - original protocol does. - - diff --git a/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild b/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild deleted file mode 100644 index 19e033b..0000000 --- a/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-info toolchain-funcs - -MY_PN='spacenav' -DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon." -HOMEPAGE="http://spacenav.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X" - -RDEPEND="X? ( x11-apps/xdpyinfo )" -DEPEND="${RDEPEND}" - -pkg_setup() { - CONFIG_CHECK="~HOTPLUG" - ERROR_CFG="Your kernel needs HOTPLUG for the spacenavd to work properly" - check_extra_config -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-destdir.patch - epatch "${FILESDIR}"/${P}-custom-flags.patch -} - -src_configure() { - econf \ - --enable-opt --enable-ldopt \ - $(use_enable X x11) -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - # Config file - insinto /etc - newins "${S}/doc/example-spnavrc" spnavrc.sample || die - - # Init script - newinitd "${FILESDIR}/spnavd" spacenavd || die - - # Daemon - dobin "${S}/spacenavd" - use X && dobin "${S}/spnavd_ctl" -} - -pkg_postinst() { - elog "To start the Spacenav daemon system-wide by default" - elog "you should add it to the default runlevel :" - elog "\`rc-update add spacenavd default\`" - elog - if use X; then - elog "To start generating Spacenav X events by default" - elog "you should add this command in your user startup" - elog "scripts such as .gnomerc or .xinitrc :" - elog "\`spnavd_ctl x11 start\`" - elog - fi - ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run" - ewarn "the new version of the daemon." -} diff --git a/sys-libs/spacenavd/spacenavd-0.5.ebuild b/sys-libs/spacenavd/spacenavd-0.5.ebuild deleted file mode 100644 index 764bced..0000000 --- a/sys-libs/spacenavd/spacenavd-0.5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils linux-info - -DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon." -HOMEPAGE="http://spacenav.sourceforge.net/" -SRC_URI="http://sourceforge.net/projects/spacenav/files/spacenav%20daemon/spacenavd%20${PV}/${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X debug" - -RDEPEND="X? ( x11-apps/xdpyinfo )" -DEPEND="${RDEPEND}" - -pkg_setup() { - CONFIG_CHECK="~HOTPLUG" - ERROR_CFG="Your kernel needs HOTPLUG for the spacenavd to work properly" - check_extra_config -} -src_prepare() { - epatch "${FILESDIR}"/${P}-destdir.patch - epatch "${FILESDIR}"/${P}-custom-flags.patch -} - -src_configure() { - econf \ - --enable-opt --enable-ldopt \ - $(use_enable X x11) \ - $(use_enable debug) -} - -src_install() { - # Config file - newconfd "${S}/doc/example-spnavrc" spnavrc - - # Init script - newinitd "${FILESDIR}/spnavd" spnavrc - - # Daemon - exeinto /usr/bin - doexe "${S}/spacenavd" - use X && doexe "${S}/spnavd_ctl" -} - -pkg_postinst() { - elog "To start the Spacenav daemon system-wide by default" - elog "you should add it to the default runlevel :" - elog "\`rc-update add spnavd default\`" - elog - if use X; then - elog "To start generating Spacenav X events by default" - elog "you should add this command in your user startup" - elog "scripts such as .gnomerc or .xinitrc :" - elog "\`spnav_ctl x11 start\`" - elog - fi - ewarn "You must restart spnavd \`/etc/init.d/spnavd restart\` to run" - ewarn "the new version of the daemon." -} diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest index cf8b8c5..404c905 100644 --- a/x11-misc/spnavcfg/Manifest +++ b/x11-misc/spnavcfg/Manifest @@ -2,5 +2,5 @@ AUX spnavcfg-0.2.1-custom-flags.patch 1336 RMD160 8691b02d04a7b39e8663f98ef0cac6 AUX spnavcfg-0.2.1-destdir.patch 542 RMD160 e7744f7243debef4f4434b609804bafbf3c0d145 SHA1 57284c303ec0e526dd1aa82dfa1473b77096b782 SHA256 573f5cf902364f1b7cab5a4168c3e2e30b1160d9c7ab9aabccceb5e57854b8b7 AUX spnavcfg-0.2.1-x11-libs.patch 520 RMD160 d7b8743f559cff2de9574bded5639609f203a7c4 SHA1 d63f355381b9372f2ea24fa82e963dc09c9642eb SHA256 65a396afe6690817c31eee7682f4fd4beb50672d931801f9fb7896d073299f3c DIST spnavcfg-0.2.1.tar.gz 18717 RMD160 fee35e0350b685004b176d9d0e2d1fddecd2ae46 SHA1 1ec1e414d8edcd1621e2c555d0fe8a06c16dbef5 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1 -EBUILD spnavcfg-0.2.1.ebuild 863 RMD160 9a2b5bbd6b2cf6a6eb35dbd5fc6b354ee90b420a SHA1 59db0833834d57b3c2cbba3e28d463804c544fb3 SHA256 e69c75617c7e39ac74359de539e0af2cfb0d9f35508c66b20b17f441c5dc6c8a +EBUILD spnavcfg-0.2.1.ebuild 863 RMD160 fd98d9f08ac803df59277ed16ed2791104df8dc9 SHA1 b1eec0776097f20526211ae6691654f05d251bca SHA256 7da02877ed2fcd7e1c6ec1b4a54b89f0e969ad0bbb2b42f5870dd83ecc63d413 MISC metadata.xml 492 RMD160 86df616711330f3905d48be9b853eac4aa429e16 SHA1 1d490b3effbc6e41914d441e78a3111cd2015177 SHA256 9a3d828bd76cf1691b505d91ff88c842dc5cabd618b756ee307aa6102cc6a2b5 diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild index 3702967..57e9a4c 100644 --- a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild +++ b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild @@ -19,7 +19,7 @@ COMMON_DEPEND="x11-libs/gtk+:2" DEPEND="${COMMON_DEPEND} dev-util/pkgconfig" RDEPEND="${COMMON_DEPEND} - sys-libs/spacenavd[X]" + app-misc/spacenavd[X]" src_prepare() { epatch "${FILESDIR}"/${P}-destdir.patch -- cgit v1.2.3-65-gdbad