summaryrefslogtreecommitdiff
path: root/kde-misc/kdiff3
diff options
context:
space:
mode:
authorTomáš Chvátal <scarabeus@gentoo.org>2009-06-14 12:54:16 +0200
committerTomáš Chvátal <scarabeus@gentoo.org>2009-06-14 12:54:16 +0200
commit148e0e994cc0fe4c0a8d03998a69c56efdc64220 (patch)
treef4427c748fc8a1d3a6101b390098476e7d7d44ce /kde-misc/kdiff3
parent016e9c5dba8939d26f5596b51bb4dc24d2a89cdf (diff)
downloadkde-148e0e994cc0fe4c0a8d03998a69c56efdc64220.tar.gz
kde-148e0e994cc0fe4c0a8d03998a69c56efdc64220.tar.bz2
kde-148e0e994cc0fe4c0a8d03998a69c56efdc64220.zip
[kde-base/kdiff3] Bit cleanup. Doc handling still not working but ebuild wont fail at least.
Diffstat (limited to 'kde-misc/kdiff3')
-rw-r--r--kde-misc/kdiff3/Manifest4
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild8
-rw-r--r--kde-misc/kdiff3/kdiff3-9999.ebuild4
3 files changed, 5 insertions, 11 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index a48e469c5ea..a8cb5452921 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,5 @@
DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
-EBUILD kdiff3-0.9.95-r1.ebuild 1171 RMD160 e7f91f6c1d4fd7f3e1ba4cd2e9b94d1ca07a6660 SHA1 cbbd0e7874fa5f9fe2cf2e7f57d271b4081c8910 SHA256 a323d371dae0dcdeebb61f8471223fac79371544d8406b6ecde57028a59b0b69
-EBUILD kdiff3-9999.ebuild 729 RMD160 1482ac72c206a6f8e88dad4fc8754be776832614 SHA1 a2fcc699a71d8ba79901276e35d837ddf08c64f2 SHA256 8e15ba9a4a01572955c86fbf8e9b671888cfa6d8958399bed760254b5425eead
+EBUILD kdiff3-0.9.95-r1.ebuild 1021 RMD160 16987f49700183c74465ce967aa1823b2036c620 SHA1 2f2551e09efe303314491d39a38bb5cc079c5a5a SHA256 12f0f85dedfab591a9b099a62a0dda96671162520fdea634a15992bc2d5f1700
+EBUILD kdiff3-9999.ebuild 739 RMD160 6b690e36ec796fea5fb0b40adf6017b0779db4d6 SHA1 fcb35420a2c3e22e209897a65f1e0f9b26b21723 SHA256 d62999b93c45e7c77eaa407747624f79fbad0375d0673fd1aa210cf2ef4524cf
MISC ChangeLog 965 RMD160 e23a294ea710d5afd9fe82c890a6101aa69cafa4 SHA1 9056fd2eea6ca7a4c867ba8e790e1e42cf46c685 SHA256 62bafe5700a6e0b3a8be7a183660641ae09089ffc801a82b7d27615200a6d2c1
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 63d6abeaa92..0b3e30cce04 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.95-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="1"
+SLOT="4"
IUSE="debug +handbook konqueror"
DEPEND="
@@ -30,12 +30,6 @@ src_prepare() {
# Append missing categories
echo "Categories=Qt;KDE;Development;" >> src-QT4/kdiff3.desktop
-
- # fix handbook
- if ! use handbook; then
- sed -e "/add_subdirectory(doc)/ s/^#DONOTWANT /" \
- -i CMakeLists.txt || die "removing docs failed"
- fi
}
src_configure() {
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index dda377bc3fb..19b35364d2a 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://kdiff3.sourceforge.net/"
LICENSE="GPL-2"
KEYWORDS=""
-SLOT="1"
-IUSE="debug konqueror"
+SLOT="4"
+IUSE="debug +handbook konqueror"
DEPEND="
konqueror? ( >=kde-base/libkonq-${KDE_MINIMAL} )