From 89ed97e598c3bd710b58cea762fb75b0c3f89e4f Mon Sep 17 00:00:00 2001 From: Anthoine Bourgeois Date: Tue, 24 Jan 2012 21:56:56 +0100 Subject: spacenav clean up. - libspnav depends on spacenavd - spacenavd depends on spnavcfg - spnavcfg build system improvement --- media-libs/libspnav/Manifest | 2 +- media-libs/libspnav/libspnav-0.2.2.ebuild | 5 ++- sys-libs/spacenavd/Manifest | 2 +- sys-libs/spacenavd/spacenavd-0.5-r1.ebuild | 3 +- x11-misc/spnavcfg/Manifest | 6 ++- .../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/metadata.xml | 13 +++++++ x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild | 21 +++++------ 10 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch create mode 100644 x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch create mode 100644 x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch create mode 100644 x11-misc/spnavcfg/metadata.xml diff --git a/media-libs/libspnav/Manifest b/media-libs/libspnav/Manifest index 0f68702..676edaa 100644 --- a/media-libs/libspnav/Manifest +++ b/media-libs/libspnav/Manifest @@ -1,5 +1,5 @@ AUX libspnav-0.2.2-custom-flags.patch 2122 RMD160 8fc4965afad03826ddc47f56eb03639b0f64e3dc SHA1 0117dbc82ca6de12e4bb533b4e8f6d5232f0e8fc SHA256 c93b5289a1ce4a69f931b0672197127fc0719b52acdf083cb199b0c0c2564b08 AUX libspnav-0.2.2-makefile.patch 541 RMD160 86bcf1c696e10d352d0f245e877e27d1fcc4bb35 SHA1 831191f1076f0e4cd09b28bdb0eae067a2685988 SHA256 af31d4569a24a20461d40d8d2054ed23b5faf8842d1a85d77b6e5ced3120c911 DIST libspnav-0.2.2.tar.gz 11615 RMD160 d49a1c9b5e556fd8ff8e7545d0983c1b205fe9f2 SHA1 c9291ed4acb38da3be4f81e6e3b43f853ce55eca SHA256 fb72388770d7dcd85b56ac2a83948983f1afd7dbe271e18d507b975ac4bea14f -EBUILD libspnav-0.2.2.ebuild 731 RMD160 cb49617f9b5556a8511fe1858bff81fde5adaf13 SHA1 8f01271482d38d51e2a9c739d7eea6804d8ed2b5 SHA256 ff08d15682ed4843916176936f128d96b7b6922055609b12da7ad5ea140a08ed +EBUILD libspnav-0.2.2.ebuild 786 RMD160 8e1466b3fed0e3df02a0dfe446a0f2f7ca606bfd SHA1 ac0bb3341ab4ae8ef028c29c2b0505308f234321 SHA256 39251503cbddc194f0475ed0d4558f0206cad4ea321b81cbd3d2206601d9dc73 MISC metadata.xml 810 RMD160 2c76c38dc1f88e28903e87ecfd219c112355a0c2 SHA1 b604eaafaab4cf7eff00c7d22378f23e281c2ea0 SHA256 60adbbeba0e80ffcade921297fbb50d0fc646b8f1cd7c768fcb034b969119358 diff --git a/media-libs/libspnav/libspnav-0.2.2.ebuild b/media-libs/libspnav/libspnav-0.2.2.ebuild index db5eca6..2d681d8 100644 --- a/media-libs/libspnav/libspnav-0.2.2.ebuild +++ b/media-libs/libspnav/libspnav-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X debug" -RDEPEND="" +RDEPEND="X? ( sys-libs/spacenavd[X] ) +!X? ( sys-libs/spacenavd )" DEPEND="${RDEPEND}" src_prepare() { diff --git a/sys-libs/spacenavd/Manifest b/sys-libs/spacenavd/Manifest index e2b549e..8278210 100644 --- a/sys-libs/spacenavd/Manifest +++ b/sys-libs/spacenavd/Manifest @@ -2,7 +2,7 @@ AUX spacenavd-0.5-custom-flags.patch 1952 RMD160 bd945358bc6c3f582df3f8d2ac1d7be 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 1615 RMD160 05a6a415657b9719be61884c5f4fe615750d9b47 SHA1 943318a20072f51db3f36d37d029b6492ff8ade5 SHA256 85f6ed6232304fa20c6da49f6fed9cbc73efc4abda113466728488031e541a1e +EBUILD spacenavd-0.5-r1.ebuild 1638 RMD160 8b509f4ebf7c6c8b9cb813cbbd18d56fbe34a2dc SHA1 8d507a04b8a9f67ce4bc4577d8686960b5f8e1f6 SHA256 117b0b471f3303276f976a4a63a820a86da7bb4e37ef802d9337271a3408bd29 EBUILD spacenavd-0.5.ebuild 1594 RMD160 fbd2872cd45c6194d4ac30b8375ad879b187a5d9 SHA1 39849f999add92b5093a562cad7a55ecced39112 SHA256 37552d30d3d46827977c4862bfe0ae06ba2472dbfe77bbd1ee2a5770e01bcef3 MISC ChangeLog 532 RMD160 40283a589c74966036c94ff1001670e500932c2e SHA1 2dd00fcc3cbaddae1407c4701c70ac3297ca48c3 SHA256 9c4a842847ca2907189d23efe3a0442ec9d909d8d48d447604e68d7b79c70f4a MISC metadata.xml 781 RMD160 53424577bb5817179fb8c23bcaafc91f62e38757 SHA1 15f130ab23ac2f9247a2cbdf6bb1e198d2347236 SHA256 5e7443c84a89d8f0785806728817cbe8d33f37b8221e8307e6365a6daaf18600 diff --git a/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild b/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild index c7dfe21..43c559d 100644 --- a/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild +++ b/sys-libs/spacenavd/spacenavd-0.5-r1.ebuild @@ -14,7 +14,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X debug" -RDEPEND="X? ( x11-apps/xdpyinfo )" +RDEPEND="X? ( x11-apps/xdpyinfo + x11-misc/spnavcfg )" DEPEND="${RDEPEND}" pkg_setup() { diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest index 593d248..54f2922 100644 --- a/x11-misc/spnavcfg/Manifest +++ b/x11-misc/spnavcfg/Manifest @@ -1,2 +1,6 @@ +AUX spnavcfg-0.2.1-custom-flags.patch 1368 RMD160 bddedeb35e6907728462c909fbd4e024a6505375 SHA1 04a39aaf85c576f58ad488231ad783fdae8e818e SHA256 4745249131b85b5d3c5e1a5bd8a95ff696d461ca454819abe6c916f76f50140d +AUX spnavcfg-0.2.1-destdir.patch 542 RMD160 e7744f7243debef4f4434b609804bafbf3c0d145 SHA1 57284c303ec0e526dd1aa82dfa1473b77096b782 SHA256 573f5cf902364f1b7cab5a4168c3e2e30b1160d9c7ab9aabccceb5e57854b8b7 +AUX spnavcfg-0.2.1-x11-libs.patch 551 RMD160 f623ade9542b1cc9b483e313f82fa622a507154f SHA1 823f6b657213b2c366b8e0df282db41f2911878d SHA256 0ce8c19cd87beb842c53441924377e308218f96512cf6931b49c70767b71f884 DIST spnavcfg-0.2.1.tar.gz 18717 RMD160 fee35e0350b685004b176d9d0e2d1fddecd2ae46 SHA1 1ec1e414d8edcd1621e2c555d0fe8a06c16dbef5 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1 -EBUILD spnavcfg-0.2.1.ebuild 875 RMD160 38615d29f81cbc24793e3289982beabb0de58305 SHA1 e1fe88d9168fb136b9836956d0e0d2c5d847f8e4 SHA256 f933cccc0f21ffa74b7774f9e90839cf2cb7e767c98cf73e2240a1503a8aa4e4 +EBUILD spnavcfg-0.2.1.ebuild 843 RMD160 14dc95e633374421b31915b47e468d7b8c3ada9b SHA1 b68f8a3ae60b7ee38fa099aae62b674879d2e906 SHA256 db74564395a7750be693235d50cbb0c38a30cf5abdaa5eeea1ed9fae5f81fce9 +MISC metadata.xml 439 RMD160 c51868353f94a3c2d23df688a08d9ea73f6dda48 SHA1 e37f60e388ed4fbead5f6ea951612a009145e8d0 SHA256 34233192007b149ee7c41fcb3ef5c25924ca75c623fc280be0d870145cfdc3ef 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 new file mode 100644 index 0000000..94b046b --- /dev/null +++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch @@ -0,0 +1,44 @@ +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:52:29.982219716 +0100 ++++ spnavcfg-0.2.1/Makefile.in 2012-01-24 20:06:07.528205248 +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 = -pedantic $(warn) $(dbg) $(opt) $(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-24 19:52:29.982219716 +0100 ++++ spnavcfg-0.2.1/configure 2012-01-24 20:03:17.079208262 +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 new file mode 100644 index 0000000..8e6848b --- /dev/null +++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..eee6775 --- /dev/null +++ b/x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch @@ -0,0 +1,12 @@ +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 21:14:55.115132278 +0100 ++++ spnavcfg-0.2.1/Makefile.in 2012-01-24 21:15:07.796132054 +0100 +@@ -6,7 +6,7 @@ warn = -Wall -Wno-int-to-pointer-cast -W + CC = gcc + INSTALL = install + CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(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/metadata.xml b/x11-misc/spnavcfg/metadata.xml new file mode 100644 index 0000000..98abae4 --- /dev/null +++ b/x11-misc/spnavcfg/metadata.xml @@ -0,0 +1,13 @@ + + + + no-herd + + anthoine.bourgeois@gmail.com + Anthoine Bourgeois + aluco's overlay maintainer + + + The spnavcfg is the GTK-based configuration GUI for sys-libs/spacenavd. + + diff --git a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild index 633a331..bda3a93 100644 --- a/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild +++ b/x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild @@ -4,7 +4,7 @@ EAPI="3" -inherit toolchain-funcs +inherit eutils DESCRIPTION="GTK-based GUI to configure a space navigator device" HOMEPAGE="http://spacenav.sourceforge.net/" @@ -19,21 +19,20 @@ COMMON_DEPEND="x11-libs/gtk+:2" DEPEND="${COMMON_DEPEND} dev-util/pkgconfig" RDEPEND="${COMMON_DEPEND} - sys-libs/spacenavd" + sys-libs/spacenavd[X]" src_prepare() { - rm configure || die - mv Makefile{.in,} || die + epatch "${FILESDIR}"/${P}-destdir.patch + epatch "${FILESDIR}"/${P}-custom-flags.patch + epatch "${FILESDIR}"/${P}-x11-libs.patch } -src_compile() { - # TODO Improve build system upstream - emake CFLAGS="${CFLAGS} $(pkg-config --cflags gtk+-2.0)" \ - LDFLAGS="${LDFLAGS} $(pkg-config --libs gtk+-2.0)" \ - CC=$(tc-getCC) \ - || die +src_configure() { + econf \ + $(use_enable debug) || die } src_install() { - emake PREFIX="${D}/usr" install || die + emake DESTDIR="${D}" install || die "Install failed" + dodoc README || die } -- cgit v1.2.3-65-gdbad