x11-drivers/nostromo_n50: Fix deps for gnome3, Version Bump, Fix fltk slot, as-needed fix

svn path=/sunrise/; revision=11959

5 files changed, 84 insertions, 35 deletions

diff --git a/x11-drivers/nostromo_n50/ChangeLog b/x11-drivers/nostromo_n50/ChangeLog
index 44ad423af..685ae8858 100644
--- a/x11-drivers/nostromo_n50/ChangeLog
+++ b/x11-drivers/nostromo_n50/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for x11-drivers/nostromo_n50
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2011; Justin Lecher <jlec@gentoo.org> -nostromo_n50-1.3.ebuild,
+  +nostromo_n50-1.4.ebuild, +files/nostromo_n50-1.4-asneeded.patch:
+  Fix deps for gnome3, Version Bump, Fix fltk slot, as-needed fix
+
   02 Mar 2008; Dwayne Asbury (kisak) <kisak42@gmail.com>
   +files/60-nostromo.rules, +nostromo_n50-1.3.ebuild, +metadata.xml:
   New ebuild from bug 211562. Thanks to Thomas, Allen, and James
diff --git a/x11-drivers/nostromo_n50/Manifest b/x11-drivers/nostromo_n50/Manifest
index eac03c159..3bdab49a6 100644
--- a/x11-drivers/nostromo_n50/Manifest
+++ b/x11-drivers/nostromo_n50/Manifest
@@ -1,5 +1,6 @@
 AUX 60-nostromo.rules 415 RMD160 4b83951344c4b34461ac44c09a429a82677554a1 SHA1 e7f1393f90739c989c261a2334591cf3fe8d4dfd SHA256 96558381f952c7a38bcf8d983c84eb8851fcfd3c6818d0b7d6d363027eb7b4a1
-DIST nostromo_n50-1.3.tar.gz 149289 RMD160 d92bd82209c2242e35c53ae0a342227943d82506 SHA1 c628fd91916f395d679f02bf03464d8365fe8b2d SHA256 3d9ec4195baaa873098877e76ccf972c1f984db65339015dbeae367b69d3fe61
-EBUILD nostromo_n50-1.3.ebuild 840 RMD160 b46cab55dd2621ca0684ee1d16e169182185d4b9 SHA1 147bf720e3ad2c4f0955611149221613dc27d7ca SHA256 f84c0d565a15d1bfe8341229450668855a87956607af101698a2602542755223
-MISC ChangeLog 317 RMD160 fca4b425674d2754796f72df29c4f1a15d5785cb SHA1 fcf46dd2424e1343254524a7920e581ad914c167 SHA256 8e5d6a0d71dc17f12c347a617bda5316ddc2687ca2b8e249014047599f3040f3
+AUX nostromo_n50-1.4-asneeded.patch 1027 RMD160 0d9c346ad1aabe703984ed9bfc3cc9ca17042a0d SHA1 df14f16c285421f887a0f0431ec56fadce9b220d SHA256 cfa8f4f1e135e8a08da2691a65d8df46446470317ba7c62921ee9f63396ed04a
+DIST nostromo_n50-1.4.tar.gz 159510 RMD160 c7953e2f057e0cc7822e636648fe596e48000ad8 SHA1 33e079c2d0246a00b82822f38dc2bbd11d7547cd SHA256 f55eaf6050129ce4cc1a94893e7bee53b7b1ee3f1fdfd2199a82a1341fc4541b
+EBUILD nostromo_n50-1.4.ebuild 970 RMD160 03432707d047798a19f02a9070e85783975289c7 SHA1 e377ec60ad694bdec1b8fbdc3411506a0b27b138 SHA256 27070ed1f9d174cd2c73a8c99cc1c1107280343aa71b00d38131880b59e31389
+MISC ChangeLog 525 RMD160 9cf1de5aaaa91873ac809cc6495d06d1539e990a SHA1 b195454a67bd09807a879d6f30b91b4e6a115630 SHA256 7596254fe8de7142e068603123e6333d1c2f2812c4a6106dde8c7e230d7c39e7
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/x11-drivers/nostromo_n50/files/nostromo_n50-1.4-asneeded.patch b/x11-drivers/nostromo_n50/files/nostromo_n50-1.4-asneeded.patch
new file mode 100644
index 000000000..dceaef644
--- /dev/null
+++ b/x11-drivers/nostromo_n50/files/nostromo_n50-1.4-asneeded.patch
@@ -0,0 +1,32 @@
+ Makefile.am     |    2 +-
+ src/Makefile.am |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8e0dd26..e3372ed 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,5 +2,5 @@
+ #
+ #
+ 
+-SUBDIRS = src doc
++SUBDIRS = src
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 27cebcc..35164b1 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,9 +6,9 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ nostromo_daemondir = $(datadir)/pixmaps
+ 
+-CXXFLAGS = @DEBUG_FLAGS@ @NOSTROMO_CFLAGS@ @FLTK_CXXFLAGS@ -DIMG_PATH=\"$(nostromo_daemondir)\"
+-CFLAGS = @DEBUG_FLAGS@ @NOSTROMO_CFLAGS@
+-LDFLAGS =  @NOSTROMO_LIBS@ @FLTK_LIBS@ -lXtst -lpthread @DEBUG_FLAGS@ @LIBS@
++AM_CXXFLAGS = @DEBUG_FLAGS@ @NOSTROMO_CFLAGS@ @FLTK_CXXFLAGS@ -DIMG_PATH=\"$(nostromo_daemondir)\"
++AM_CFLAGS = @DEBUG_FLAGS@ @NOSTROMO_CFLAGS@
++LIBS =  @NOSTROMO_LIBS@ @FLTK_LIBS@ -lXtst -lpthread @DEBUG_FLAGS@ @LIBS@
+ 
+ bin_PROGRAMS = nostromo_config nostromo_daemon nostromo_remote
+ nostromo_config_SOURCES = nost_data.h \
diff --git a/x11-drivers/nostromo_n50/nostromo_n50-1.3.ebuild b/x11-drivers/nostromo_n50/nostromo_n50-1.3.ebuild
deleted file mode 100644
index cf139ed6e..000000000
--- a/x11-drivers/nostromo_n50/nostromo_n50-1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils linux-info
-
-DESCRIPTION="Configuration GUI for Belkin Nostromo n50/n52 speedpads."
-HOMEPAGE="http://sf.net/projects/nostromodriver"
-SRC_URI="mirror://sourceforge/nostromodriver/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="x11-libs/libXft
-	x11-libs/libXtst
-	dev-libs/libxml2
-	x11-libs/gtk+"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-libs/fltk
-	x11-proto/xextproto"
-CONFIG_CHECK="INPUT_EVDEV"
-
-src_install() {
-	einstall || die "einstall failed"
-	insinto /etc/udev/rules.d
-	doins "${FILESDIR}/60-nostromo.rules"
-
-	make_desktop_entry nostromo_config "Nostromo Configuration" n50_tray.png "System"
-	make_desktop_entry nostromo_daemon "Nostromo Daemon" n50_tray.png "System"
-}
diff --git a/x11-drivers/nostromo_n50/nostromo_n50-1.4.ebuild b/x11-drivers/nostromo_n50/nostromo_n50-1.4.ebuild
new file mode 100644
index 000000000..cde07ab39
--- /dev/null
+++ b/x11-drivers/nostromo_n50/nostromo_n50-1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit autotools eutils linux-info
+
+DESCRIPTION="Configuration GUI for Belkin Nostromo n50/n52 speedpads."
+HOMEPAGE="http://sf.net/projects/nostromodriver/"
+SRC_URI="mirror://sourceforge/nostromodriver/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXft
+	x11-libs/libXtst
+	dev-libs/libxml2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-libs/fltk:1
+	x11-proto/xextproto"
+
+CONFIG_CHECK="INPUT_EVDEV"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	dohtml doc/*
+	insinto /etc/udev/rules.d
+	doins "${FILESDIR}/60-nostromo.rules"
+
+	make_desktop_entry nostromo_config "Nostromo Configuration" /usr/share/pixmaps/n50_tray.png "System"
+	make_desktop_entry nostromo_daemon "Nostromo Daemon" /usr/share/pixmaps/n50_tray.png "System"
+}