diff options
author | Jonathan Callen <abcd@gentoo.org> | 2009-10-12 23:58:48 +0000 |
---|---|---|
committer | Jonathan Callen <abcd@gentoo.org> | 2009-10-12 23:58:48 +0000 |
commit | 79626f5024ff1d1285babae5945faf3d6a5fc3ae (patch) | |
tree | 0f1c7c1cf827c9b63bedd71a87f588cf298c037f | |
parent | Clean out cruft (diff) | |
download | gentoo-2-79626f5024ff1d1285babae5945faf3d6a5fc3ae.tar.gz gentoo-2-79626f5024ff1d1285babae5945faf3d6a5fc3ae.tar.bz2 gentoo-2-79626f5024ff1d1285babae5945faf3d6a5fc3ae.zip |
Clean out cruft
(Portage version: -svn/cvs/Linux i686)
-rw-r--r-- | kde-base/kopete/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch | 22 | ||||
-rw-r--r-- | kde-base/kopete/kopete-3.5.10-r3.ebuild | 144 |
3 files changed, 5 insertions, 167 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index f4ba4a961c85..aec048598a8e 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.217 2009/10/12 22:00:49 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.218 2009/10/12 23:58:47 abcd Exp $ + + 12 Oct 2009; Jonathan Callen <abcd@gentoo.org> + -files/kopete-3.5.9-icq-protocol-change.patch, -kopete-3.5.10-r3.ebuild: + Clean out cruft 12 Oct 2009; Jonathan Callen <abcd@gentoo.org> -kopete-3.5.9.ebuild, -kopete-3.5.9-r2.ebuild: diff --git a/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch b/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch deleted file mode 100644 index f0de7e690678..000000000000 --- a/kde-base/kopete/files/kopete-3.5.9-icq-protocol-change.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp ---- kdenetwork-3.5.9.orig/kopete/protocols/oscar/oscarversionupdater.cpp 2008-02-14 01:11:52.000000000 +0100 -+++ kdenetwork-3.5.9/kopete/protocols/oscar/oscarversionupdater.cpp 2008-07-01 20:06:00.000000000 +0200 -@@ -89,13 +89,13 @@ - kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; - KConfigGroup config( KGlobal::config(), "ICQVersion" ); - -- mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" ); -+ mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" ); - mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 ); -- mICQVersion.major = config.readEntry( "Major", "0x0014" ).toUShort( 0, 0 ); -- mICQVersion.minor = config.readEntry( "Minor", "0x0034" ).toUShort( 0, 0 ); -+ mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 0 ); -+ mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 0 ); - mICQVersion.point = config.readEntry( "Point", "0x0000" ).toUShort( 0, 0 ); -- mICQVersion.build = config.readEntry( "Build", "0x0BB8" ).toUShort( 0, 0 ); -- mICQVersion.other = config.readEntry( "Other", "0x0000043D" ).toUInt( 0, 0 ); -+ mICQVersion.build = config.readEntry( "Build", "0x17AB" ).toUShort( 0, 0 ); -+ mICQVersion.other = config.readEntry( "Other", "0x00007535" ).toUInt( 0, 0 ); - mICQVersion.country = config.readEntry( "Country", "us" ); - mICQVersion.lang = config.readEntry( "Lang", "en" ); - } diff --git a/kde-base/kopete/kopete-3.5.10-r3.ebuild b/kde-base/kopete/kopete-3.5.10-r3.ebuild deleted file mode 100644 index 9e30a83b192d..000000000000 --- a/kde-base/kopete/kopete-3.5.10-r3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r3.ebuild,v 1.1 2009/05/26 17:34:34 tampakrap Exp $ - -KMNAME=kdenetwork -EAPI="1" -inherit kde-meta eutils - -DESCRIPTION="KDE multi-protocol IM client" -HOMEPAGE="http://kopete.kde.org/" - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="jingle ssl xscreensaver slp kernel_linux kdehiddenvisibility" -PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex netmeeting nowlistening - statistics texteffect translator webpresence" -PROTOCOLS="groupwise irc jabber oscar msn sametime sms winpopup yahoo" -IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" - -# Even more broken tests... -RESTRICT="test" - -# The kernel_linux? ( ) conditional dependencies are for webcams, not supported -# on other kernels AFAIK -BOTH_DEPEND=" - =app-crypt/qca-1.0* - >=dev-libs/glib-2 - dev-libs/libxml2 - dev-libs/libxslt - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - jabber? ( - net-dns/libidn - ) - jingle? ( - dev-libs/expat - >=media-libs/speex-1.1.6 - ~net-libs/ortp-0.7.1 - ) - kernel_linux? ( virtual/opengl ) - sametime? ( =net-libs/meanwhile-1.0* ) - sms? ( app-mobilephone/gsmlib ) - xscreensaver? ( x11-libs/libXScrnSaver ) -" -RDEPEND=" - ${BOTH_DEPEND} - crypt? ( app-crypt/gnupg ) - latex? ( - media-gfx/imagemagick - virtual/latex-base - ) - ssl? ( =app-crypt/qca-tls-1.0* ) -" -# !kde-base/kdenetwork is handled by the eclass. -# gnomemeeting is deprecated and ekiga is not yet ~ppc64 -# only needed for calling -# netmeeting? ( net-im/gnomemeeting )" - -DEPEND=" - ${BOTH_DEPEND} - x11-proto/videoproto - kernel_linux? ( - virtual/os-headers - x11-libs/libXv - ) - xscreensaver? ( x11-proto/scrnsaverproto ) -" - -pkg_setup() { - if use kernel_linux && ! built_with_use x11-libs/qt:3 opengl; then - eerror "To support Video4Linux webcams in this package is required to have" - eerror "x11-libs/qt:3 compiled with OpenGL support." - eerror "Please reemerge x11-libs/qt:3 with USE=\"opengl\"." - die "Please reemerge x11-libs/qt:3 with USE=\"opengl\"." - fi -} - -kopete_disable() { - einfo "Disabling $2 $1" - sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am" -} - -src_unpack() { - kde-meta_src_unpack - - epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch" - epatch "${FILESDIR}/${PN}-3.5.5-icqfix.patch" - epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" - epatch "${FILESDIR}/${PN}-3.5-rolling_icon.patch" - - use addbookmarks || kopete_disable plugin addbookmarks - use alias || kopete_disable plugin alias - use autoreplace || kopete_disable plugin autoreplace - use connectionstatus || kopete_disable plugin connectionstatus - use contactnotes || kopete_disable plugin contactnotes - use crypt || kopete_disable plugin cryptography - use highlight || kopete_disable plugin highlight - use history || kopete_disable plugin history - use latex || kopete_disable plugin latex - use netmeeting || kopete_disable plugin netmeeting - use nowlistening || kopete_disable plugin nowlistening - use statistics || kopete_disable plugin statistics - use texteffect || kopete_disable plugin texteffect - use translator || kopete_disable plugin translator - use webpresence || kopete_disable plugin webpresence - - kopete_disable protocol '\$(GADU)' - use groupwise || kopete_disable protocol groupwise - use irc || kopete_disable protocol irc - use jabber || kopete_disable protocol '\$(JABBER)' - use oscar || kopete_disable protocol oscar - use msn || kopete_disable protocol msn - use winpopup || kopete_disable protocol winpopup - use yahoo || kopete_disable protocol yahoo - - rm -f "${S}/configure" -} - -src_compile() { - local myconf=" - --without-xmms - $(use_enable debug testbed) - $(use_enable jingle) - $(use_enable sametime meanwhile) - $(use_enable sms smsgsm) - $(use_with xscreensaver) - " - - kde_src_compile -} - -src_install() { - kde_src_install - - rm -f "${D}${KDEDIR}"/bin/{stun,relay}server -} - -pkg_postinst() { - kde_pkg_postinst - - elog "If you would like to use Off-The-Record encryption, emerge net-im/kopete-otr." -} |