summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-12 13:41:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-12 13:41:12 +0000
commit6bcf4a6b4fe69e48d490cc9d9041b1343c917670 (patch)
treeacd0bb90c65f16b21f156ca895d5ef49ddc641da /kde-misc
parentold (diff)
downloadgentoo-2-6bcf4a6b4fe69e48d490cc9d9041b1343c917670.tar.gz
gentoo-2-6bcf4a6b4fe69e48d490cc9d9041b1343c917670.tar.bz2
gentoo-2-6bcf4a6b4fe69e48d490cc9d9041b1343c917670.zip
old
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdiff3/Manifest15
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff71
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch21
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild27
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.92.ebuild66
5 files changed, 0 insertions, 200 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 420e0471018a..95e2d4bd3d62 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,20 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kdiff3-0.9.92-desktop-entry-fix.diff 2387 RMD160 4802bd372f778e547e2823134af09e323f05344e SHA1 d696d0e56fd0061a420519b5d6d4eb2591562198 SHA256 d482410a87ef734ba8af5b0463afbfe9a8b039a1234717e56288589176d8aa8f
-AUX kdiff3-0.9.92-fix-desktop-file.patch 704 RMD160 76f117113b51c56eece21f0879f376c836b62b73 SHA1 05280a698785bb154becd9b0ea650d1bc6873778 SHA256 c74e30dbab7af17f6cd6d477a68fe9ad396c8d749a509d7770e58823a07e7c51
AUX kdiff3-0.9.95-desktop-entry.patch 440 RMD160 1f064018c4d8992f9f360152ce2df74f128c536c SHA1 666c0fab0aec64f66d3373828790a33206ccf0b2 SHA256 c333be340fc1ad636c3c90f29c7ac28a3ca720dcfe9428d316f363329faed948
-DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb8 SHA1 c97b98150a1f5de16736a399affe1b4243d1e6c2 SHA256 ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
DIST kdiff3-0.9.95.tar.gz 1508467 RMD160 7fc03495f581c9089f6914499c7237b49f053d98 SHA1 1fb27e8b42463ea23ad0169e20819352c1c476b7 SHA256 0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f
-EBUILD kdiff3-0.9.92-r1.ebuild 635 RMD160 78a6c93d90c2ee40293c83095069d8614924fd01 SHA1 fd7c3b062b015b03504b1d085fefb6ea2a54f326 SHA256 6f62b6f203afabcf40bde95799a1f387515ba0aea858353e17ab21d8936d8494
-EBUILD kdiff3-0.9.92.ebuild 1992 RMD160 e53917aa05aa473992e0e1df172a959b4b9795d0 SHA1 7748d1d0005962a60e4f24dc89fa3330da98f88a SHA256 a0b154234054886070afe7741926ae3248ccfc9272b9fd354f1b87e7f6dc1e7f
EBUILD kdiff3-0.9.95.ebuild 872 RMD160 c3e3d55c5f584d3a33b2b0b61f1b5d37226fce8e SHA1 a784876b558a730d22fb7223ca129d6c28f2544c SHA256 e6a3ba71b876bf512f926bb1c5a1e1127f89145075abb24bbd23db7c56956ecc
MISC ChangeLog 7854 RMD160 7754ec6da71c95cb93729bb22c59ef20fd5bbf76 SHA1 d95060f1f5b818bf711e62bfdda72e76b17dc077 SHA256 8d135cb400057df792ebe94b8c0f801d5e7956aee91399a3663aa832f43482b4
MISC metadata.xml 337 RMD160 987f2ea930df64c8621ce9e9ad2bc3e4b493f87c SHA1 05eb9bceea062c2393a1b12adca0df1cfb3b2c5e SHA256 efb6060c548053f718e7d63581e8a2637b5b5d6ee7f386e628c34292a40f180b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrbXhAACgkQkKaRLQcq0GIZvACeJi8kYxly5+x9B72jJM2AH7Yu
-EdwAnRXRMeUkV0yyBtFBIVr/OWxMOL4+
-=bsLo
------END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff b/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff
deleted file mode 100644
index 7517f81afa29..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- kdiff3plugin/kdiff3plugin.desktop 2006-11-14 23:06:16.000000000 +0100
-+++ /dev/null 2008-06-15 10:46:49.536002197 +0200
-@@ -1,7 +0,0 @@
--[Desktop Entry]
--Encoding=UTF-8
--Type=Service
--Name=Compare/Merge Files/Directories with KDiff3
--Icon=kdiff3
--X-KDE-ParentApp=konqueror
--#DocPath=konq-plugins/kdiff3plugin/index.html
-\ No newline at end of file
---- kdiff3plugin/Makefile.am.orig 2008-06-07 03:46:09.000000000 +0200
-+++ kdiff3plugin/Makefile.am 2008-06-16 00:14:10.000000000 +0200
-@@ -13,8 +13,5 @@
- pluginsdir = $(kde_servicesdir)
- plugins_DATA = kdiff3_plugin.desktop
-
--appsdir = $(kde_appsdir)/.hidden
--apps_DATA = kdiff3plugin.desktop
--
- messages: rc.cpp
- $(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot
---- src/Makefile.am.orig 2008-06-16 01:28:37.000000000 +0200
-+++ src/Makefile.am 2008-06-16 01:30:58.000000000 +0200
-@@ -29,9 +29,9 @@
- kdiff3_LDADD = $(LIB_KPARTS)
-
- # this is where the desktop file will go
--shelldesktopdir = $(kde_appsdir)/Development
-+shelldesktopdir = $(xdg_appsdir)
- shelldesktop_DATA = kdiff3.desktop
-
- # this is where the shell's XML-GUI resource file goes
- shellrcdir = $(kde_datadir)/kdiff3
- shellrc_DATA = kdiff3_shell.rc
---- src/kdiff3.desktop.orig 2008-06-16 01:35:21.000000000 +0200
-+++ src/kdiff3.desktop 2008-06-16 01:36:24.000000000 +0200
-@@ -1,6 +1,4 @@
--
- [Desktop Entry]
--Encoding=UTF-8
- Name=KDiff3
- Name[hi]=के-डिफ3
- Name[sv]=Kdiff3
-@@ -46,10 +44,11 @@
- GenericName[xx]=xxDiff/Patch Frontendxx
- GenericName[zh_CN]=Diff/Patch 前端
- GenericName[zu]=Diff/PatchIsiqalo sokugcina
--Exec=kdiff3 %i %m -caption "%c"
-+Categories=Qt;KDE;Development;
-+Exec=kdiff3 %i -caption "%c"
- Icon=kdiff3
- Type=Application
--DocPath=kdiff3/index.html
-+X-DocPath=kdiff3/index.html
- Comment=A File And Directory Comparison And Merge Tool
- Comment[ar]=أداة مقارنة و دمج ملفات و دلائل (مجلًدات )
- Comment[bg]=Инструмент за сравняване и сливане на файлове и директории
---- src/kdiff3part.desktop.orig 2008-06-16 02:52:00.000000000 +0200
-+++ src/kdiff3part.desktop 2008-06-16 02:53:07.000000000 +0200
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=KDiff3Part
- Name[cs]=Komponenta KDiff3
- Name[fr]=Composant KDiff3
-@@ -16,3 +15,4 @@
- ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
- X-KDE-Library=libkdiff3part
- Type=Service
-+Icon=kdiff3
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch b/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
deleted file mode 100644
index 056f07af6156..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- kdiff3-0.9.92.orig/src/kdiff3.desktop 2006-11-04 12:44:14.000000000 +0100
-+++ kdiff3-0.9.92/src/kdiff3.desktop 2007-08-20 20:13:35.000000000 +0200
-@@ -1,6 +1,5 @@
-
- [Desktop Entry]
--Encoding=UTF-8
- Name=KDiff3
- Name[hi]=के-डिफ3
- Name[sv]=Kdiff3
-@@ -46,9 +45,10 @@
- GenericName[xx]=xxDiff/Patch Frontendxx
- GenericName[zh_CN]=Diff/Patch 前端
- GenericName[zu]=Diff/PatchIsiqalo sokugcina
--Exec=kdiff3 %i %m -caption "%c"
-+Exec=kdiff3 %i %m -caption "%c"
- Icon=kdiff3
- Type=Application
-+Categories=Qt;KDE;Development;
- DocPath=kdiff3/index.html
- Comment=A File And Directory Comparison And Merge Tool
- Comment[ar]=أداة مقارنة و دمج ملفات و دلائل (مجلًدات )
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild
deleted file mode 100644
index b8dd6119fbba..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92-r1.ebuild,v 1.2 2008/06/21 14:05:05 mr_bones_ Exp $
-
-ARTS_REQUIRED="never"
-
-inherit kde
-
-DESCRIPTION="KDE-based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
-IUSE=""
-
-RDEPEND="sys-apps/diffutils"
-
-need-kde 3.5
-
-PATCHES=( "${FILESDIR}/kdiff3-0.9.92-desktop-entry-fix.diff" )
-
-src_compile(){
- rm "${S}"/configure
- kde_src_compile
-}
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
deleted file mode 100644
index ccf6fe57aa3f..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.11 2008/06/21 10:33:41 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="KDE-based frontend to diff3"
-HOMEPAGE="http://kdiff3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kdiff3/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="sys-apps/diffutils"
-
-need-kde 3.5
-
-LANGS="ar az bg br ca cs cy da de el en_GB es et fr ga gl hi hu is it ja ka lt
-nb nl pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tg tr uk zh_CN"
-
-LANGS_DOC="da de en es et fr it nl pt sv"
-
-for lang in ${LANGS}; do
- IUSE="${IUSE} linguas_${lang}"
-done
-
-src_unpack() {
- kde_src_unpack
-
- # Adapted from kde.eclass
- if [[ -z ${LINGUAS} ]]; then
- einfo "You can drop some of the translations of the interface and"
- einfo "documentation by setting the \${LINGUAS} variable to the"
- einfo "languages you want installed."
- einfo
- einfo "Enabling all languages"
- else
- if [[ -n ${LANGS} ]]; then
- MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | tr ' ' '\n' | sort | uniq -d))
- einfo "Enabling translations for: ${MAKE_PO}"
- local tmp=""
- for x in ${MAKE_PO}; do
- tmp+="${x}.po "
- done
- MAKE_PO=${tmp}
- sed -i -e "s:^POFILES =.*:POFILES = ${MAKE_PO}:" "${KDE_S}/po/Makefile.am" \
- || die "sed for locale failed"
-
- rm -f "${KDE_S}/configure"
- fi
-
- if [[ -n ${LANGS_DOC} ]]; then
- MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | tr ' ' '\n' | sort | uniq -d))
- einfo "Enabling documentation for: ${MAKE_DOC}"
- [[ -n ${MAKE_DOC} ]] && [[ -n ${DOC_DIR_SUFFIX} ]] && MAKE_DOC=$(echo "${MAKE_DOC}" | tr '\n' ' ') && MAKE_DOC="${MAKE_DOC// /${DOC_DIR_SUFFIX} }"
- sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC} :" \
- "${KDE_S}/doc/Makefile.am" || die "sed for locale failed"
- rm -f "${KDE_S}/configure"
- fi
- fi
-
- # Fixes bug 186942
-# epatch "${FILESDIR}"/${P}-fix-desktop-file.patch
-}