johu        14/03/20 22:08:32

  Modified:             ChangeLog
  Added:                kdiff3-0.9.97-r2.ebuild
  Log:
  Revision bump to EAPI 5.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

Revision  Changes    Path
1.70                 kde-misc/kdiff3/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.70&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?rev=1.70&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/ChangeLog?r1=1.69&r2=1.70

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog   2 Mar 2013 21:29:51 -0000       1.69
+++ ChangeLog   20 Mar 2014 22:08:32 -0000      1.70
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kdiff3
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.69 2013/03/02 
21:29:51 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.70 2014/03/20 
22:08:32 johu Exp $
+
+*kdiff3-0.9.97-r2 (20 Mar 2014)
+
+  20 Mar 2014; Johannes Huber <j...@gentoo.org> +kdiff3-0.9.97-r2.ebuild:
+  Revision bump to EAPI 5.
 
   02 Mar 2013; Markos Chandras <hwoar...@gentoo.org> kdiff3-0.9.97-r1.ebuild:
   Move Qt dependencies to the new category



1.1                  kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild?rev=1.1&content-type=text/plain

Index: kdiff3-0.9.97-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.97-r2.ebuild,v 
1.1 2014/03/20 22:08:31 johu Exp $

EAPI=5

if [[ ${PV} != *9999* ]]; then
        KDE_LINGUAS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et 
fr ga
        gl hi hne hr hu is it ja ka lt mai ml nb nds nl nn pl pt pt_BR ro ru rw 
sk
        sv ta tg tr ug uk zh_CN zh_TW"
        SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
        KDE_HANDBOOK="optional"
else
        
ESVN_REPO_URI="https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/kdiff3";
        KEYWORDS=""
fi

KDE_REQUIRED="optional"
inherit kde4-base qt4-r2

DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/";

LICENSE="GPL-2"
SLOT="4"
IUSE="debug kde"

DEPEND="
        dev-qt/qtcore:4
        dev-qt/qtgui:4
        kde? ( $(add_kdebase_dep kdelibs) )
"
RDEPEND="${DEPEND}
        sys-apps/diffutils
"

PATCHES=(
        "${FILESDIR}/${PN}-0.9.97-relativepath.patch"
)

RESTRICT="!kde? ( test )"

src_unpack(){
        if [[ ${PV} == *9999* ]]; then
                subversion_src_unpack
        elif use kde; then
                kde4-base_src_unpack
        else
                qt4-r2_src_unpack
        fi
}

src_prepare() {
        if ! use kde; then
                # adapt to Gentoo paths
                sed -e s,documentation.path.*$,documentation.path\ =\ 
"${EPREFIX}"/usr/share/doc/"${PF}", \
                -e s,target.path.*$,target.path\ =\ "${EPREFIX}"/usr/bin, \
                "${S}"/src-QT4/kdiff3.pro > "${S}"/src-QT4/kdiff3_fixed.pro
        else
                kde4-base_src_prepare
        fi
}

src_configure() {
        if use kde; then
                kde4-base_src_configure
        else
                eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro
        fi
}

src_compile() {
        if use kde; then
                kde4-base_src_compile
        else
                qt4-r2_src_compile
        fi
}

src_install() {
        if use kde; then
                kde4-base_src_install
        else
                qt4-r2_src_install
        fi
}

src_test() {
        if use kde; then
                kde4-base_src_test
        fi
}




Reply via email to