Clean up ebuild, patches.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

4 files changed, 26 insertions, 25 deletions

diff --git a/x11-misc/lineakd/ChangeLog b/x11-misc/lineakd/ChangeLog
index 71745f54766f..69c047b06561 100644
--- a/x11-misc/lineakd/ChangeLog
+++ b/x11-misc/lineakd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/lineakd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/ChangeLog,v 1.53 2009/07/22 09:00:44 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/ChangeLog,v 1.54 2012/09/12 01:36:56 jer Exp $
+
+  12 Sep 2012; Jeroen Roovers <jer@gentoo.org> lineakd-0.9.0-r1.ebuild,
+  files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch,
+  files/lineakd-0.9.0-gcc43.patch:
+  Clean up ebuild, patches.
 
   22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   lineakd-0.9.0-r1.ebuild,
diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch b/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch
index a2e460f4153a..4435b1a25e07 100644
--- a/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch
+++ b/x11-misc/lineakd/files/lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch
@@ -1,6 +1,5 @@
-diff -ur lineakd-0.9.orig/lineakd/lineakkb.def lineakd-0.9/lineakd/lineakkb.def
---- lineakd-0.9.orig/lineakd/lineakkb.def	2006-03-25 03:35:57.000000000 +0200
-+++ lineakd-0.9/lineakd/lineakkb.def	2009-07-22 11:59:02.000000000 +0300
+--- a/lineakd/lineakkb.def
++++ b/lineakd/lineakkb.def
 @@ -2040,9 +2040,29 @@
       Previous       = 144
       Next           = 153
diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch b/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch
index 95e1c7cde8a3..c36a7375c060 100644
--- a/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch
+++ b/x11-misc/lineakd/files/lineakd-0.9.0-gcc43.patch
@@ -1,6 +1,5 @@
-
---- lineakd-0.9.orig/lineak/xmgr.cpp
-+++ lineakd-0.9/lineak/xmgr.cpp
+--- a/lineak/xmgr.cpp
++++ b/lineak/xmgr.cpp
 @@ -21,6 +21,8 @@
  #include <lineak/lbutton.h>
  
@@ -10,8 +9,8 @@
     #include <signal.h>
     #include <X11/Xlib.h>
     #include <X11/keysym.h>
---- lineakd-0.9.orig/lineak/defloader.h
-+++ lineakd-0.9/lineak/defloader.h
+--- a/lineak/defloader.h
++++ b/lineak/defloader.h
 @@ -23,6 +23,7 @@
  #   endif
  
@@ -20,8 +19,8 @@
  #   include <map>
  
  class LDef;
---- lineakd-0.9.orig/lineak/pluginmanager.cpp
-+++ lineakd-0.9/lineak/pluginmanager.cpp
+--- a/lineak/pluginmanager.cpp
++++ b/lineak/pluginmanager.cpp
 @@ -34,6 +34,7 @@
  #include <unistd.h>
  #include <dirent.h>
@@ -30,8 +29,8 @@
  }
  
  using namespace lineak_core_functions;
---- lineakd-0.9.orig/lineak/cdromctrl.cpp
-+++ lineakd-0.9/lineak/cdromctrl.cpp
+--- a/lineak/cdromctrl.cpp
++++ b/lineak/cdromctrl.cpp
 @@ -51,6 +51,7 @@
  
  #include <stdio.h>
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
index 404b87212868..0b4440e6e057 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild,v 1.9 2009/07/22 09:00:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild,v 1.10 2012/09/12 01:36:56 jer Exp $
 
+EAPI=4
 inherit eutils multilib
 
 MY_P=${P/.0/}
@@ -29,16 +30,14 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_enable debug) --with-x
-	emake || die "emake failed."
 }
 
 src_install() {
@@ -46,13 +45,12 @@ src_install() {
 
 	dodir /usr/share/man/man8
 
-	emake -j1 DESTDIR="${D}" install || die "emake install failed."
+	emake -j1 DESTDIR="${D}" install
 	dodoc AUTHORS README TODO
 	keepdir /usr/$(get_libdir)/lineakd/plugins
 
 	insinto /etc/lineak
-	doins lineakd.conf.example
-	doins lineakd.conf.kde.example
+	doins lineakd.conf.example lineakd.conf.kde.example
 }
 
 pkg_postinst() {