diff options
Diffstat (limited to 'x11-misc/spnavcfg')
-rw-r--r-- | x11-misc/spnavcfg/Manifest | 6 | ||||
-rw-r--r-- | x11-misc/spnavcfg/files/spnavcfg-0.2.1-custom-flags.patch | 44 | ||||
-rw-r--r-- | x11-misc/spnavcfg/files/spnavcfg-0.2.1-destdir.patch | 16 | ||||
-rw-r--r-- | x11-misc/spnavcfg/files/spnavcfg-0.2.1-x11-libs.patch | 12 | ||||
-rw-r--r-- | x11-misc/spnavcfg/metadata.xml | 13 | ||||
-rw-r--r-- | x11-misc/spnavcfg/spnavcfg-0.2.1.ebuild | 21 |
6 files changed, 100 insertions, 12 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>no-herd</herd> + <maintainer> + <email>anthoine.bourgeois@gmail.com</email> + <name>Anthoine Bourgeois</name> + <description>aluco's overlay maintainer</description> + </maintainer> + <longdescription> + The spnavcfg is the GTK-based configuration GUI for sys-libs/spacenavd. + </longdescription> +</pkgmetadata> 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 } |