Forcibly disabled gadu for kopete-3.5 ebuilds as they won't build against system gadu and use a bundled insecure version - fixes bug 264613.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 294 insertions, 2 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 14d79eb6d06d..481083cb0af1 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,14 @@
 # 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.184 2009/05/10 11:20:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.185 2009/05/15 02:29:11 jmbsvicetto Exp $
+
+*kopete-3.5.10-r1 (15 May 2009)
+*kopete-3.5.9-r1 (15 May 2009)
+
+  15 May 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +kopete-3.5.9-r1.ebuild, +kopete-3.5.10-r1.ebuild:
+  Forcibly disabled gadu for kopete-3.5 ebuilds as they won't build against
+  system gadu and use a bundled insecure version - fixes bug 264613.
 
   10 May 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml:
   Remove unused local useflags
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 73b1f98a8d22..99328c7ad366 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -9,9 +9,11 @@ DIST kdenetwork-3.5.10.tar.bz2 9336764 RMD160 f888f53746f1e734d3c15c09eac1c2b9c0
 DIST kdenetwork-3.5.9.tar.bz2 9339308 RMD160 3df73e0cd2b628cb49d12da3af663288aebdfd71 SHA1 a4901468e94d3433468ebf1f2213b93b37496cca SHA256 fc196f4e340255af1ab15d9346c40e77fcdd1d61114f6f999670c0a6cd23cc14
 DIST kdenetwork-4.2.2.tar.bz2 7174894 RMD160 e9bcf31475785ed2ecc7148cba7e1650cdc6ea3d SHA1 335a09012602400318d6e703fdcc390f5a2f7761 SHA256 18c55e54f772b25133a223fad3cef0187f098991ddca6785389cf088aa3816f5
 DIST kdenetwork-4.2.3.tar.bz2 7038337 RMD160 428c5356e716d3d0f60b766f3ad362b0599d8b6f SHA1 633432d049794f50143ed60197f6f0b5ac9011a7 SHA256 b3d9b5d1107acc8c2875a3ff6f8c645b42673f6c3ad2c66043dfbb543f1e298f
+EBUILD kopete-3.5.10-r1.ebuild 3958 RMD160 e0060d18ab60368a5b6fd28c5869fe799525be7f SHA1 483a312844e38234e041aeb85668a9be18543df7 SHA256 bede4f5a77e2aef2d22c473398365f7b61f46838873f828919be0e604c2b86ed
 EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071
+EBUILD kopete-3.5.9-r1.ebuild 4092 RMD160 3f3355e691ee4f8316307edd3f950401085dc662 SHA1 c72582231a5f709c7b41aaeda9231220e0f3f7bb SHA256 421231780e2d0b3d2696576a8eb857b1a10978b61878d70fa51b11e01b1a78b0
 EBUILD kopete-3.5.9.ebuild 4176 RMD160 cf1327ab6f51b56d533aa0807975477027c76aa2 SHA1 64cd84aceda4987fcbcc38c433e11329aaa4ff7e SHA256 7e95a6a931c2d80e0896e38ef1a40d498a7ffc54d6cb1624a1aeb9a7aeccebeb
 EBUILD kopete-4.2.2-r1.ebuild 3597 RMD160 d856b853cee36adeba65a99eae63529c1404db02 SHA1 3f4bdcedad862db10469a02c45148a69f2b3369f SHA256 975bc003e3b29b9a248f5f5a749f9e619d94cb7f93d456785a9088caabe51315
 EBUILD kopete-4.2.3.ebuild 3597 RMD160 20be5f1971ae05da999c68a63115f839e53feba5 SHA1 6e57e3834b1a3f8eb1ba28dafdb9256f6a50274d SHA256 3de9470cd03ce7887757319db0105436b55454a0e176c837c1137141c9c0346f
-MISC ChangeLog 26638 RMD160 2419e0c2c5992de2558cb2202beed6418a35fa7f SHA1 697b513cb3d924667182188ebf6ea4e317569499 SHA256 a6241a866638eedac1f52fc5240cf88d189006803056d73f84668adb8a54dee2
+MISC ChangeLog 26970 RMD160 78c8377c57588516dee5ddf61a9b4590c96943cf SHA1 4c2d96e9907c4f2defb79d12aaa5c0e71ce5d26e SHA256 f26ba16649e56f879145724f807d12184f8fe4f9090ac427803c5f6461c0c781
 MISC metadata.xml 2634 RMD160 10b05cb985eeffdae72c7b18dfbc42fc8905c801 SHA1 4c17c656188e65a0cb00f0a3622f02fa7fb4af9a SHA256 c837ab1bcc7057217bedf5ff46fb22faca6f766aa09db915bb0da4738509b86d
diff --git a/kde-base/kopete/kopete-3.5.10-r1.ebuild b/kde-base/kopete/kopete-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..8caf4aaa7177
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.10-r1.ebuild
@@ -0,0 +1,139 @@
+# 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.9-r1.ebuild b/kde-base/kopete/kopete-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..92f1fc080bd4
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.9-r1.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.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."
+}