From d01ecb68a6a7530cdb1c5889b92a04a8e8b303d2 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Sun, 17 May 2009 17:00:49 +0000 Subject: Bumped kopete-3.5.10 and kopete-3.5.9 to fix the USE="-meanwhile" compilation issue and improved handling of protocols. Added missing use flags and allowed the optional compilation of all protocols. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- kde-base/kopete/ChangeLog | 11 ++- kde-base/kopete/kopete-3.5.10-r1.ebuild | 139 ------------------------------ kde-base/kopete/kopete-3.5.10-r2.ebuild | 143 +++++++++++++++++++++++++++++++ kde-base/kopete/kopete-3.5.9-r1.ebuild | 143 ------------------------------- kde-base/kopete/kopete-3.5.9-r2.ebuild | 147 ++++++++++++++++++++++++++++++++ 5 files changed, 300 insertions(+), 283 deletions(-) delete mode 100644 kde-base/kopete/kopete-3.5.10-r1.ebuild create mode 100644 kde-base/kopete/kopete-3.5.10-r2.ebuild delete mode 100644 kde-base/kopete/kopete-3.5.9-r1.ebuild create mode 100644 kde-base/kopete/kopete-3.5.9-r2.ebuild (limited to 'kde-base') diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 481083cb0af1..cfd50628fab1 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,15 @@ # 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.185 2009/05/15 02:29:11 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.186 2009/05/17 17:00:49 jmbsvicetto Exp $ + +*kopete-3.5.10-r2 (17 May 2009) +*kopete-3.5.9-r2 (17 May 2009) + + 17 May 2009; Jorge Manuel B. S. Vicetto + -kopete-3.5.9-r1.ebuild, +kopete-3.5.9-r2.ebuild, + -kopete-3.5.10-r1.ebuild, +kopete-3.5.10-r2.ebuild: + Bumped kopete-3.5.10 and kopete-3.5.9 to fix the USE="-meanwhile" + compilation issue and improved handling of protocols. *kopete-3.5.10-r1 (15 May 2009) *kopete-3.5.9-r1 (15 May 2009) diff --git a/kde-base/kopete/kopete-3.5.10-r1.ebuild b/kde-base/kopete/kopete-3.5.10-r1.ebuild deleted file mode 100644 index 8caf4aaa7177..000000000000 --- a/kde-base/kopete/kopete-3.5.10-r1.ebuild +++ /dev/null @@ -1,139 +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-r1.ebuild,v 1.1 2009/05/15 02:29:11 jmbsvicetto 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 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 - net-dns/libidn - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - 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" - - 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 sametime || kopete_disable protocol meanwhile - 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." -} diff --git a/kde-base/kopete/kopete-3.5.10-r2.ebuild b/kde-base/kopete/kopete-3.5.10-r2.ebuild new file mode 100644 index 000000000000..bc81bdb454e3 --- /dev/null +++ b/kde-base/kopete/kopete-3.5.10-r2.ebuild @@ -0,0 +1,143 @@ +# 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-r2.ebuild,v 1.1 2009/05/17 17:00:49 jmbsvicetto 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" + + 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." +} diff --git a/kde-base/kopete/kopete-3.5.9-r1.ebuild b/kde-base/kopete/kopete-3.5.9-r1.ebuild deleted file mode 100644 index 92f1fc080bd4..000000000000 --- a/kde-base/kopete/kopete-3.5.9-r1.ebuild +++ /dev/null @@ -1,143 +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.9-r1.ebuild,v 1.1 2009/05/15 02:29:11 jmbsvicetto Exp $ - -KMNAME=kdenetwork -EAPI="1" -inherit kde-meta eutils - -SRC_URI="${SRC_URI} - mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2" - -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 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 - net-dns/libidn - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - 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}-icq-protocol-change.patch" - epatch "${FILESDIR}/${PN}-3.5.10-gcc43.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 sametime || kopete_disable protocol meanwhile - 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." -} diff --git a/kde-base/kopete/kopete-3.5.9-r2.ebuild b/kde-base/kopete/kopete-3.5.9-r2.ebuild new file mode 100644 index 000000000000..436884ce4bba --- /dev/null +++ b/kde-base/kopete/kopete-3.5.9-r2.ebuild @@ -0,0 +1,147 @@ +# 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.9-r2.ebuild,v 1.1 2009/05/17 17:00:49 jmbsvicetto Exp $ + +KMNAME=kdenetwork +EAPI="1" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2" + +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}-icq-protocol-change.patch" + epatch "${FILESDIR}/${PN}-3.5.10-gcc43.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." +} -- cgit v1.2.3-65-gdbad