Clean up ebuild, patches.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

5 files changed, 42 insertions, 31 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/Manifest b/x11-misc/lineakd/Manifest
index b71f5db7d81d..7af643674397 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,6 +1,16 @@
-AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 972 RMD160 73ac19cf6928dd84753598ba013234da882b80b5 SHA1 bc1e7c12993bd4906f8126372dcb5b1bd47ef60e SHA256 79414adc2f417096f47a9a087834200822d952e82e251eb83fe68fd6f6a76ca4
-AUX lineakd-0.9.0-gcc43.patch 873 RMD160 766f8cbdd90b908875540116e8712f8af1272ac5 SHA1 531fe251ca2886afdb1d3acb5cefd35c5d3d18b0 SHA256 99094f8f099de228ea8dec7a4906484a64afa4b45a26dcdea04e40b475cb3fe5
-DIST lineakd-0.9.tar.gz 991376 RMD160 fcc5c9fc3a5f9dec0f4824eec1ed46a0ad29fa98 SHA1 c678e6cf72bc54a6bfe76a41ba53e401732a7d4d SHA256 39fd34f8df4d31d16adacce1191b34cef5e510b536701120906ec708be21010b
-EBUILD lineakd-0.9.0-r1.ebuild 1435 RMD160 37eff0514b3d64b7d04836c72cfb8a23b6c5e5c8 SHA1 477fc2b9668cf230aeebe50fdfff197b5c561def SHA256 a24d685e12b61d95dec6913d8507e054a3a981f8f866ccb588874885cd6d01cc
-MISC ChangeLog 7577 RMD160 4559a81a94989eb1e4c855af0e485e23b423904a SHA1 9847484336575757f4dd69358629bb5b4de6a829 SHA256 1f7571bb42bd3890fada6ac5e74a0c9196ca414064404262d87473804d7f1774
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 SHA256 e97a0d8ffbef1f88c554a8163312e00681ad27c4a1fa89d66ca3c4785acb4355 SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee WHIRLPOOL 48a59a1c5219ab0e7bf3c04a2829cea1e1a0f3f2d1e70851a6f45e40426ac34f6ac6aa518be92a7512914143cbb333769db0be8d5564e859db06cbbde59ca06f
+AUX lineakd-0.9.0-gcc43.patch 772 SHA256 86927dc758d8e6bfbc222e365607d00dc8f11514c2caf9974c1b5d395749ac5b SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407 WHIRLPOOL 9068df3af150a81413a60b76b0a3a3ba2b2cbb623e4c253c99d51ee1cbad2c7678cfb6838b705e10e3fea7f18a75102a7a768db8d7eff7dcc4d4a3214fbbfe35
+DIST lineakd-0.9.tar.gz 991376 SHA256 39fd34f8df4d31d16adacce1191b34cef5e510b536701120906ec708be21010b SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e WHIRLPOOL 6c6f556c34df24c1fe1c973cd813b7dd3f4b6c91836b49c84b7f1f8d6f1cc9463885396b505feda285e61e34623d443eeea70cfee68b18af8e3ca132b7bcd33f
+EBUILD lineakd-0.9.0-r1.ebuild 1352 SHA256 f746d6edfed2365222ca94305247c5a09b0701a8c0064862f6492fb4dbb786ed SHA512 38f97049eff004050c053d0489162c9ed1d6e6f96c9848b3c8cc927ad57c7d725fab3cc22af931d811bccae7ee126dff57c72e7f19295d732eed99267e4dc76e WHIRLPOOL 7a60006571a7b67675b1e129e6b3779baff81ae48fe7b7b14f7bf48560729d5894157c7dae11dc3de64e9570a04b8857184aa0f3a3454fba77cc9d0b74861aba
+MISC ChangeLog 7760 SHA256 3fad671dcf80958acdb737ae2ce90168a2a5f54d9309e93f398b02d70dd7e338 SHA512 327d77022ae654c0fc59202fa1f007973130c9f5c62b43dbd6b4c9b43fe046e3198a3c80edd320e43434759e205ffe42317ceea70ccda5787158474af864d1c6 WHIRLPOOL 6e6ee9263b5fce1acad001439aed1acd1c081568de4a2bc881d5dc3b2a097303f7b6a5c480d2950928cc0754b6a879fabf5fb23001a21b6adafd17d8f108e6f5
+MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBP5z4ACgkQVWmRsqeSphNl6wCcCA6swZVY/GeaZhN9f+zYAD2Y
+47EAnRWD6zCK3vWm9l6ifBUf2/0AT1FL
+=wU6q
+-----END PGP SIGNATURE-----
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() {