summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-03-18 18:22:37 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2015-03-18 18:22:37 +0000
commit21eca7673238169cb78edf39ae0dcfcf5d788fea (patch)
tree58022dc9446c01c7ea6a6941bcfd409aa782912a /kde-misc/kdiff3
parentDrop USE=x265 mask (bug #510340). (diff)
downloadgentoo-2-21eca7673238169cb78edf39ae0dcfcf5d788fea.tar.gz
gentoo-2-21eca7673238169cb78edf39ae0dcfcf5d788fea.tar.bz2
gentoo-2-21eca7673238169cb78edf39ae0dcfcf5d788fea.zip
Use default instead of deprecated base eclass, thanks Nikoli <nikoli@gmx.us>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/ChangeLog5
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.98-r1.ebuild10
2 files changed, 9 insertions, 6 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/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
}