diff options
| author | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-30 12:47:59 +0200 |
|---|---|---|
| committer | Tomáš Chvátal <scarabeus@gentoo.org> | 2009-05-30 12:47:59 +0200 |
| commit | 740590a714c65a45f2c6d29e1eb8d42caa191e90 (patch) | |
| tree | 8a032c416b43d67f843d06d8588bcf26c830f762 | |
| parent | 986639da8eedbdcaeb3499f1805392f389fb05e1 (diff) | |
| download | kde-740590a714c65a45f2c6d29e1eb8d42caa191e90.tar.gz kde-740590a714c65a45f2c6d29e1eb8d42caa191e90.tar.bz2 kde-740590a714c65a45f2c6d29e1eb8d42caa191e90.zip | |
Jingle disabled by uspstream because it is FUBAR.
| -rw-r--r-- | kde-base/kopete/Manifest | 2 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-9999.ebuild | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest index 489d39673eb..39bee1b0d2b 100644 --- a/kde-base/kopete/Manifest +++ b/kde-base/kopete/Manifest @@ -3,6 +3,6 @@ DIST kdenetwork-4.2.88.tar.lzma 6360466 RMD160 49949bcd84a443f82669cec2ede18b142 EBUILD kopete-4.2.4.ebuild 3597 RMD160 d856b853cee36adeba65a99eae63529c1404db02 SHA1 3f4bdcedad862db10469a02c45148a69f2b3369f SHA256 975bc003e3b29b9a248f5f5a749f9e619d94cb7f93d456785a9088caabe51315 EBUILD kopete-4.2.88.ebuild 3461 RMD160 d772c9227e144e078c8f5ac16c7fb6a8a945688d SHA1 2ac133c59090b46a7f120a4ecc56ebec3c5a6c17 SHA256 8dd3d512417881227e67cbb7c0fd18f8acf29704043f8cabcb150eaa841a84c7 EBUILD kopete-4.2.9999.ebuild 3555 RMD160 d478d2a8432c83d256a710d3326288035b43e332 SHA1 6413a1ff91d47a9ce67acc24305d79af2461bf4d SHA256 86ccdc620e3dab6a6c8176ee2fb980acf6a08f12496e50af8f43c6074b0c99f3 -EBUILD kopete-9999.ebuild 3450 RMD160 02ab96cd864bca6e5fada33dd0e2a41f946f5d59 SHA1 a70b587c75b4d777519097ec2d3da776f77d24ba SHA256 73dc45ffad5e0e48aa60289e80c27f6ff5a18dd5959a3a1d8b00db43be6419e2 +EBUILD kopete-9999.ebuild 3085 RMD160 fef76ef9694dd52b9419e64916eb56ced00998f4 SHA1 8c2ce7ed3113c0da684244dd5de00c152ea8cd1a SHA256 1b86db28117ade1f1824a3d78b36ad600a300894da800c085fa9a8cf4e831c24 MISC ChangeLog 8554 RMD160 935e6c674dbb4c89307b2d42bf271ded46c67b61 SHA1 344849c066fcd0b46b4bf1b689989e5f3b0e54de SHA256 ff8bbca1c988ada12c18f6b69657ec532a75ba4c56d36f5966a7ae45c7a07255 MISC metadata.xml 2855 RMD160 45ffbfe563cd1bc8b44641660a27dc105412069a SHA1 b9f1b16e12ea744f14e28f9050209f794531dd42 SHA256 6f185f8b4705c32209f2053132b72c02e15528ac0831123b8a781917000d1262 diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild index 067a22fad32..a446fc4d865 100644 --- a/kde-base/kopete/kopete-9999.ebuild +++ b/kde-base/kopete/kopete-9999.ebuild @@ -41,7 +41,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex # groupwise: app-crypt/qca:2 # irc: NO DEPS, probably will fail so inform user about it # jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK -# jingle: media-libs/speex net-libs/ortp +# jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM # meanwhile: net-libs/meanwhile # msn: libmsn == this is wlm plugin, we disable msn one # oscar: NO DEPS @@ -51,7 +51,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex # testbed: NO DEPS # winpopup: NO DEPS # yahoo: NO DEPS -PROTOCOLS="bonjour gadu groupwise +jabber jingle meanwhile msn oscar qq +PROTOCOLS="bonjour gadu groupwise +jabber meanwhile msn oscar qq testbed winpopup yahoo" # disabled protocols @@ -68,11 +68,6 @@ COMMONDEPEND=" groupwise? ( app-crypt/qca:2 ) jabber? ( app-crypt/qca:2 - net-dns/libidn - jingle? ( - >=media-libs/speex-1.2_rc1 - >=net-libs/ortp-0.13 - ) ) meanwhile? ( net-libs/meanwhile ) msn? ( net-libs/libmsn ) @@ -107,14 +102,6 @@ src_configure() { for x in ${PLUGINS}; do mycmakeargs="${mycmakeargs} $(cmake-utils_use_with ${x/+/})" done - # additional defines - if use jingle && ! use jabber; then - elog "You enabled jingle but not jabber useflag. Jingle is integral part of" - elog "jabber protocol so it wont be used." - fi - if use jabber; then - mycmakeargs="${mycmakeargs} -DNO_JINGLE=$(use jingle && echo OFF || echo ON)" - fi kde4-meta_src_configure } |