summaryrefslogtreecommitdiff
path: root/kde-misc/kdiff3
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/Manifest4
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild19
-rw-r--r--kde-misc/kdiff3/kdiff3-9999.ebuild14
3 files changed, 25 insertions, 12 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 822b17f6bb4..7aaca41c955 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,4 @@
DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
-EBUILD kdiff3-0.9.95-r1.ebuild 908 RMD160 cb4f82e608cdeb2505db4ec6cd051d02989614c8 SHA1 d5939d647be794daf3c1975541af2f362cb7c997 SHA256 f3d367c4ab806868078f10b82f9dee2e8f60c0abee5727f7e9e645d53d9d580a
-EBUILD kdiff3-9999.ebuild 727 RMD160 499d65745f343d3b6cd6f9c5ccd42477d6952092 SHA1 0ffdf8f4cca22afb182bc14fff8788aa930f2321 SHA256 d51528ab6484097ee4690e9551db6442687eb15f4d21e1d8d843180cf338200d
+EBUILD kdiff3-0.9.95-r1.ebuild 987 RMD160 a1e325020697417bc0e0e777f30653cd9dcf3e99 SHA1 3f2bb2a220c5fa7ba7ca188648a709d74a2d33cc SHA256 f61787c69ab0bf5fb2bd0b5cae81949cad43c055a3ec0e361f28a74dfcbead56
+EBUILD kdiff3-9999.ebuild 857 RMD160 4bdc09361b88f94da5214956b30f6ed64de8b8af SHA1 a1ced328e3b71d3869c47d262b1dd8bc5b7dbdc1 SHA256 f1d7d5ece209179ebe90c7b4cd636193ac027b382de67e96e34b6d30f76a9108
MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
diff --git a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
index bea908a1f78..649c4d9aaaa 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
@@ -6,14 +6,21 @@ EAPI="2"
KDE_LINGUAS="ar bg br cs cy da de el en_GB es et fr ga gl hi hu it ja ka lt nb
nds nl pl pt pt_BR ro ru rw sv ta tg tr uk zh_CN"
-inherit kde4-base
+
+if [[ ${PV} = *9999* ]]; then
+ KMNAME="extragear/utils"
+ eclass="kde4-meta"
+else
+ eclass="kde4-base"
+ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
+fi
+inherit ${eclass}
DESCRIPTION="KDE-based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS=""
SLOT="4"
IUSE="debug +handbook konqueror"
@@ -26,10 +33,10 @@ RDEPEND="${DEPEND}
"
src_prepare() {
- kde4-base_src_prepare
+ ${eclass}_src_prepare
# Append missing categories
- echo "Categories=Qt;KDE;Development;" >> src-QT4/kdiff3.desktop
+ echo "Categories=Qt;KDE;Development;" >> src/kdiff3.desktop
}
src_configure() {
@@ -37,5 +44,5 @@ src_configure() {
$(cmake-utils_use_with konqueror LibKonq)
)
- kde4-base_src_configure
+ ${eclass}_src_configure
}
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 98cd3302a7b..de607442cfb 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -4,8 +4,14 @@
EAPI="2"
-KMNAME="extragear/utils"
-inherit kde4-base
+if [[ ${PV} = *9999* ]]; then
+ KMNAME="extragear/utils"
+ eclass="kde4-meta"
+else
+ eclass="kde4-base"
+ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
+fi
+inherit ${eclass}
DESCRIPTION="KDE-based frontend to diff3"
HOMEPAGE="http://kdiff3.sourceforge.net/"
@@ -24,7 +30,7 @@ RDEPEND="${DEPEND}
"
src_prepare() {
- kde4-base_src_prepare
+ ${eclass}_src_prepare
# Append missing categories
echo "Categories=Qt;KDE;Development;" >> src/kdiff3.desktop
@@ -35,5 +41,5 @@ src_configure() {
$(cmake-utils_use_with konqueror LibKonq)
)
- kde4-base_src_configure
+ ${eclass}_src_configure
}