summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-15 11:03:41 +0000
committerJohannes Huber <johu@gentoo.org>2012-08-15 11:03:41 +0000
commit600609e5ff5cc98bac7e0a3979619559c7c304de (patch)
tree803561b3a05ea07abcfb2ddefd70f15feb84c639
parentStable ppc, bug #428926 (diff)
downloadgentoo-2-600609e5ff5cc98bac7e0a3979619559c7c304de.tar.gz
gentoo-2-600609e5ff5cc98bac7e0a3979619559c7c304de.tar.bz2
gentoo-2-600609e5ff5cc98bac7e0a3979619559c7c304de.zip
Version bump.
(Portage version: 2.2.0_alpha120/cvs/Linux i686)
-rw-r--r--kde-misc/kdiff3/ChangeLog7
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.97.ebuild91
2 files changed, 97 insertions, 1 deletions
diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 62948d51e0e9..842ba9bf896a 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-misc/kdiff3
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.57 2012/07/26 17:03:43 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.58 2012/08/15 11:03:41 johu Exp $
+
+*kdiff3-0.9.97 (15 Aug 2012)
+
+ 15 Aug 2012; Johannes Huber <johu@gentoo.org> +kdiff3-0.9.97.ebuild:
+ Version bump.
26 Jul 2012; Johannes Huber <johu@gentoo.org> kdiff3-0.9.96.ebuild:
Add missing slot dependencies on Qt.
diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.ebuild b/kde-misc/kdiff3/kdiff3-0.9.97.ebuild
new file mode 100644
index 000000000000..d6ad36576b94
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-0.9.97.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/08/15 11:03:41 johu Exp $
+
+EAPI=4
+
+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 ~ppc64 ~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="
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+ kde? ( $(add_kdebase_dep kdelibs) )
+"
+RDEPEND="${DEPEND}
+ sys-apps/diffutils
+"
+
+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
+
+ echo "Categories=Qt;KDE;Development;" >> "${S}"/src-QT4/kdiff3.desktop
+}
+
+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
+}