Use default instead of deprecated base eclass, thanks Nikoli <nikoli@gmx.us>

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

3 files changed, 25 insertions, 22 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 67a1dc12674e..c61032844ca8 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.75 2015/03/18 16:40:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.76 2015/03/18 18:22:37 voyageur Exp $
+
+  18 Mar 2015; Bernard Cafarelli <voyageur@gentoo.org> kdiff3-0.9.98-r1.ebuild:
+  Use default instead of deprecated base eclass, thanks Nikoli <nikoli@gmx.us>
 
 *kdiff3-0.9.98-r1 (18 Mar 2015)
 
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 663128a2dfd4..6c9988ecddea 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -5,26 +5,26 @@ AUX kdiff3-0.9.97-relativepath.patch 2542 SHA256 affa8b351b96109748a1909d83d89e3
 DIST kdiff3-0.9.97.tar.gz 1803769 SHA256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a SHA512 8f4e89e594894a3fbfaa2e5c9cc345ab16e6787c4efc4324fffe55fbe45b94c2ff10ba411279d2b433a0a5fa752653f7b3e663577cc0d658dfc4d5b797a22fab WHIRLPOOL 190590f3c4290afee73672a77ec4f16a923d156f097bcbb4dce1893f57b1199d1f7ed19166a8173292a7bedda5e54f792474f169a50ed8eb47a92b24f7b1c57c
 DIST kdiff3-0.9.98.tar.gz 1762715 SHA256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668 SHA512 867f0b1d5beb421f1bf84e6044d8d9279d434900faa1962fd5417653ef6b1cc71a8f5dd6c29cd4826a1c70a6075786faeaee780548521ce2ce221d83229b52e6 WHIRLPOOL 4099488985182d36fc4ecf532914c1439273036e38b66f7584282b6b232c3c4a738ecab35dd8b1a30b9a368cf6a6f9aeebea38e921063b55ac3972f46e118c98
 EBUILD kdiff3-0.9.97-r2.ebuild 1916 SHA256 8b0cc037a63f8979125a651f84d7c9e292b3ed4101e131c5777ba0a4a040ff8f SHA512 a95d46ae3f39541339692a4c2ac79220371e0505a875174c85d68022ea543fe6c8c96b54b61a9ddb402233e431d6f61ba265dfb7a6842117a0c74fe77cddb994 WHIRLPOOL a271f4adfef9543d587cd6878539100825c47db947ecf3b685014cfe0418c6ea1917446587b70a3c0cc018d7875360d4d2bf0c55744e6282c241213716c777a8
-EBUILD kdiff3-0.9.98-r1.ebuild 2065 SHA256 b7ad1e389e0c819a13544791b2dee0b33eb67937c83b34c49cff6fb527d94142 SHA512 f1831a8faa63e8006a902c561956020f1fd9a2d916d543cc2865dfb647d63c24aca0abb9531e7b00cda8ffd86e6d34daff870182c80832c1599ae5038cc706de WHIRLPOOL ff856eeffbd2ce4cfcf32ca5ea8a31b3b8680d2159ae433ca105f0be76ed065a182fca2476eff1cca382d1ed148ea26b3fd79b4a1242a9fb5d032e5cdd95e477
+EBUILD kdiff3-0.9.98-r1.ebuild 2040 SHA256 891091b2a9cdec052a9c94ec4f4ec7fe1ccf88eed964b5c22c8d8d01d4317a96 SHA512 058b30fd5745c5cb3152d8dd7e323add861d23d77f5ae9f55a034d89f7ae6b7215dac59b01e9888cf4c1fb97cc559dff95df062e6661fdf0007929ef21af4fef WHIRLPOOL f28fd639639bd0d7f97452859615c6c12c074691168a7f8d385df12fe69dcecd273b396bd352b5958ce1a410c5a513b7a265e33522ee73e9344a98ea439b9094
 EBUILD kdiff3-0.9.98.ebuild 1865 SHA256 040c9a043eccd3cfcf17dd272084adf794293a16dca428432b1aa612734f23a2 SHA512 06124da74e5fed36f6f2394add6062ac284587b3cb2ada59cd4db70c592f66634797e95c111c713395827d2566fbec8135f6f23d41a627cfd9527ae09c644f28 WHIRLPOOL 80cb0afab335818e02148109193843101ece2de9d5c94f64ac039f4c63739ccb7d724232860607e245f872f49827ed479b834feb788676ba657968ac315d3a9d
-MISC ChangeLog 11880 SHA256 4eb38b54e8514d8450b9693e663d79d01071a387eba9a6823c5006c4a39464fa SHA512 dcf9a7d961d5c1c5ec7f00b7fc2716e8f92c60eda0e5af4d1b524609217ecbed44e2d50dba9a7857d39dde8e90223328d67511e7ddfd67f240f93ef103aab4d2 WHIRLPOOL c0fe501932c4d89e65fadcbe9f7debfb8a91d19823ddbea78237289ba2b1839e58bf7b70ec8019325f6f7eb1a28f3a1fd365af13d4c43b8cb06c6991e3b1864c
+MISC ChangeLog 12040 SHA256 d5002b0fe48aa28b3f9e63eb16b65ab073d264e28da94b697f430e40111674ea SHA512 7a81572238ed0891659e91f8aa61e1d7d0e242571b5b1da69cebf8303ab8314e3713587c92b842e8384ee2065f699a403457515f043900d350bbc8ed645e0d18 WHIRLPOOL d1f005e5bd5289c271d5fc96eb0735ce8998c62edc453fb32bb4a0e5e6b0808776b5d902755e4c429ad2fe008c516846654f2fb3f418c1d6a1c1801598c86a62
 MISC metadata.xml 256 SHA256 53ee238b560db384f60c055e935009dc11608a62ad34f0aab2657ece46d75839 SHA512 9fde5d60815147e6baff866eec6908cad7a6b1eda5b93daaae21b2aaa8db5e7257276476d46d7bf1164d44afe81cf9c6d20526b2a0b2d2cf65596f550d026c2b WHIRLPOOL 2cd0b5ee996efd9f0d19e77361e7fd354e698aec9547280cdc7ec6e5a2904dfa9e983cddb75b23bac157bed152b331da0dce42908e61d441ef94829b70317a61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCaplXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVCcJxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
-MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/i6YQAI8bC2nuGuGJVv51Fb8YIm93
-kYcw4K6xiwEU9DyV2Bt26y5ZX5dUc/aLp9WvRdcbn8pdbdtTLPC0bfmXaID9VriO
-zHeefi9M9OhaSBKjpSL3PgaUUGQmKGh4xdjfSWgf+LYFF8cjIhg0wjVFV70WcaXW
-aKmUxtOFlKL/w8A4ZvVvd/cwKSbzjYSoMF6IOOv4eWkaOrsZ9fdAOudPGNzslK01
-BHzHVfDpITdFpJhSW44eLhjZNFEfYjrjHkiO+HB+o6cxjWcDjSSfy39tuhC4rSQy
-nqfd8iY3TMLE2CN6DfhLutW4LNcrOYQXSRNCqK+aDZl0GC6sxIfkfb2WdpGdZ98f
-VGeQADEM1/AkgwXv0CKaBkV8nr+qdZbtATpQKlZ0aMIU30jAswtEHNpW2ORW7iNy
-fbv0Ox52VAiSgvUGCmG5TEey4AynqADGMUg5SDKMPvmXioo8iTYcR2abHCwCa7V4
-qyxtDVlVFP8EGlzHzM0qIP2igrGfysIWjAWfp+HNXYAPqKl215Yfd/+tkgVSyK/p
-V9SGk/+0Ql0DX3QXQ57Qlu0lKM2TBclfzIDo+NTeKiKkY1zvXgTBqEWo+eLZSVwj
-K8mE96rNOc+xQmsQP7f1Lz0mOLVXWq767tKV4qq/GEYOzKavRS9L/AcaC0FxPAEf
-Zx56MSmy6IRhHbcL3jav
-=k19J
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/mG0QAOaTp6rL8Drvp4U5fpSeTuUT
+Q5ko6TmV1lteStVTWD5J9pSBh5C5L/uxzNsC6U/7ptZrHqMBqh5Kky4UYkgFsxJF
+1zWTaYkqxD+MYreRPxqU26sWQBy29bP14c/ZU+m+MEjmoGYv5+tWt19ZyiqqLEio
+utzegRfR/DILF1Ui/ckSqKIvdHnAchMBo3J3niy6921zeXuESeRWdE7no3H4p7of
+gBV9mug1iThjipwGfMdbGPINaFDzVMRsoIlN9Spn6R6oj43qQQkkOZXEI41GrNsR
+mjr19XAwzb8mnzgN7c0ehNY6nloJyYnO7/HJWtbtCjpiXB8ygHC8OZwRZ9iY3PRL
+jWQsKdd5hLLpHK6aNZPLI62e19kF+5VVBvgBTy1RpsZ6o7Tu/FtzOG+mP9P8mMhg
+hQ5Wsauhg+sdjqlMRwlChPdpxBbJjolaiiP8r1iovjgw7ySerBsQRkLC52MNcGtH
+GaLA8NyS0HvuGqf3mtWHuTpLKPiYCzPddmf+Zk5qW1QIzWKFTXo4/rvozeHu06xi
+J7KFbzFQp+c1htvmVbiF+n/a7QTZ0nhm93lMXZLy3MB1BRFrNmnQ/u868S0buJ1A
+ngaa19/ano5B4YEoiqNe9BdxUM38DDfjcHL+OBGu1e7nicYCDTLEmapG3Uqj1vOy
+8LZib4W1MFO80EYkI6oh
+=SSyz
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
index 11a232450284..d37578af3749 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild,v 1.1 2015/03/18 16:40:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild,v 1.2 2015/03/18 18:22:37 voyageur Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ else
 fi
 
 KDE_REQUIRED="optional"
-inherit base kde4-base qmake-utils
+inherit kde4-base qmake-utils
 
 DESCRIPTION="Qt/KDE based frontend to diff3"
 HOMEPAGE="http://kdiff3.sourceforge.net/"
@@ -52,7 +52,7 @@ src_unpack(){
 		git-r3_src_unpack
 		mv "${S}"/${PN}/* "${S}" || die
 	else
-		base_src_unpack
+		default
 	fi
 }
 
@@ -81,7 +81,7 @@ src_compile() {
 	if use kde; then
 		kde4-base_src_compile
 	else
-		base_src_compile
+		default
 	fi
 }
 
@@ -89,7 +89,7 @@ src_install() {
 	if use kde; then
 		kde4-base_src_install
 	else
-		base_src_install INSTALL_ROOT="${D}"
+		emake INSTALL_ROOT="${D}" install
 	fi
 }