johu        14/08/06 16:56:52

  Modified:             ChangeLog
  Added:                kdiff3-0.9.98.ebuild
  Log:
  Version bump, bug #519162.
  
  (Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 
0xF3CFD2BD)

Revision  Changes    Path
1.73                 kde-misc/kdiff3/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog   25 Apr 2014 16:58:23 -0000      1.72
+++ ChangeLog   6 Aug 2014 16:56:52 -0000       1.73
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.72 2014/04/25 
16:58:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.73 2014/08/06 
16:56:52 johu Exp $
+
+*kdiff3-0.9.98 (06 Aug 2014)
+
+  06 Aug 2014; Johannes Huber <[email protected]> +kdiff3-0.9.98.ebuild:
+  Version bump, bug #519162.
 
   25 Apr 2014; Johannes Huber <[email protected]> kdiff3-0.9.97-r2.ebuild:
   DEPEND on sys-devel/gettext by Nikoli <[email protected]>, bug #508702.



1.1                  kde-misc/kdiff3/kdiff3-0.9.98.ebuild

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

Index: kdiff3-0.9.98.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.98.ebuild,v 1.1 
2014/08/06 16:56:52 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
        KEYWORDS=""
fi

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

DESCRIPTION="Qt/KDE based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/";
EGIT_REPO_URI=( "git://git.code.sf.net/p/kdiff3/code" )

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

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

RESTRICT="!kde? ( test )"

src_unpack(){
        if [[ ${PV} == *9999* ]]; then
                git-r3_src_unpack
                mv "${S}"/${PN}/* "${S}" || die
        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