diff options
| -rw-r--r-- | kde-apps/kopete/kopete-16.03.90.ebuild | 25 | ||||
| -rw-r--r-- | kde-apps/kopete/kopete-16.04.49.9999.ebuild | 25 | ||||
| -rw-r--r-- | kde-apps/kopete/kopete-9999.ebuild | 25 |
3 files changed, 27 insertions, 48 deletions
diff --git a/kde-apps/kopete/kopete-16.03.90.ebuild b/kde-apps/kopete/kopete-16.03.90.ebuild index 0685e5a2c70..41134130a32 100644 --- a/kde-apps/kopete/kopete-16.03.90.ebuild +++ b/kde-apps/kopete/kopete-16.03.90.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK="optional" inherit kde4-base @@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND} ssl? ( app-crypt/qca:2[openssl] ) winpopup? ( net-fs/samba ) " -# telepathy? ( net-libs/decibel )" DEPEND="${COMMONDEPEND} jingle? ( dev-libs/jsoncpp ) !aqua? ( x11-proto/scrnsaverproto ) @@ -121,27 +120,27 @@ src_configure() { local x x2 # Handle common stuff local mycmakeargs=( - $(cmake-utils_use_with jingle GOOGLETALK) - $(cmake-utils_use_with jingle LiboRTP) - $(cmake-utils_use_with jingle Mediastreamer) - $(cmake-utils_use_with jingle Speex) - $(cmake-utils_use_disable v4l VIDEOSUPPORT) + -DWITH_GOOGLETALK=$(usex jingle) + -DWITH_LiboRTP=$(usex jingle) + -DWITH_Mediastreamer=$(usex jingle) + -DWITH_Speex=$(usex jingle) + -DDISABLE_VIDEOSUPPORT=$(usex !v4l) ) # enable protocols for x in ${PROTOCOLS}; do case ${x/+/} in zeroconf) x2=bonjour ;; xmpp) x2=jabber ;; - *) x2='' ;; + *) x2=${x/+/} ;; esac - mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) + mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) done mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF ) # enable plugins for x in ${PLUGINS}; do - mycmakeargs+=($(cmake-utils_use_with ${x/+/})) + mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) ) done kde4-base_src_configure @@ -150,12 +149,6 @@ src_configure() { pkg_postinst() { kde4-base_pkg_postinst - #if use telepathy; then - # elog "To use kopete telepathy plugins, you need to start gabble first:" - # elog "GABBLE_PERSIST=1 telepathy-gabble &" - # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'" - #fi - if ! use ssl; then if use xmpp ; then # || use irc; then if ! has_version "app-crypt/qca:2[openssl]" ; then diff --git a/kde-apps/kopete/kopete-16.04.49.9999.ebuild b/kde-apps/kopete/kopete-16.04.49.9999.ebuild index ea8ef2f221c..2430c97800b 100644 --- a/kde-apps/kopete/kopete-16.04.49.9999.ebuild +++ b/kde-apps/kopete/kopete-16.04.49.9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK="optional" inherit kde4-base @@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND} ssl? ( app-crypt/qca:2[openssl] ) winpopup? ( net-fs/samba ) " -# telepathy? ( net-libs/decibel )" DEPEND="${COMMONDEPEND} jingle? ( dev-libs/jsoncpp ) !aqua? ( x11-proto/scrnsaverproto ) @@ -121,27 +120,27 @@ src_configure() { local x x2 # Handle common stuff local mycmakeargs=( - $(cmake-utils_use_with jingle GOOGLETALK) - $(cmake-utils_use_with jingle LiboRTP) - $(cmake-utils_use_with jingle Mediastreamer) - $(cmake-utils_use_with jingle Speex) - $(cmake-utils_use_disable v4l VIDEOSUPPORT) + -DWITH_GOOGLETALK=$(usex jingle) + -DWITH_LiboRTP=$(usex jingle) + -DWITH_Mediastreamer=$(usex jingle) + -DWITH_Speex=$(usex jingle) + -DDISABLE_VIDEOSUPPORT=$(usex !v4l) ) # enable protocols for x in ${PROTOCOLS}; do case ${x/+/} in zeroconf) x2=bonjour ;; xmpp) x2=jabber ;; - *) x2='' ;; + *) x2=${x/+/} ;; esac - mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) + mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) done mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF ) # enable plugins for x in ${PLUGINS}; do - mycmakeargs+=($(cmake-utils_use_with ${x/+/})) + mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) ) done kde4-base_src_configure @@ -150,12 +149,6 @@ src_configure() { pkg_postinst() { kde4-base_pkg_postinst - #if use telepathy; then - # elog "To use kopete telepathy plugins, you need to start gabble first:" - # elog "GABBLE_PERSIST=1 telepathy-gabble &" - # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'" - #fi - if ! use ssl; then if use xmpp ; then # || use irc; then if ! has_version "app-crypt/qca:2[openssl]" ; then diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index ea8ef2f221c..2430c97800b 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 KDE_HANDBOOK="optional" inherit kde4-base @@ -111,7 +111,6 @@ RDEPEND="${COMMONDEPEND} ssl? ( app-crypt/qca:2[openssl] ) winpopup? ( net-fs/samba ) " -# telepathy? ( net-libs/decibel )" DEPEND="${COMMONDEPEND} jingle? ( dev-libs/jsoncpp ) !aqua? ( x11-proto/scrnsaverproto ) @@ -121,27 +120,27 @@ src_configure() { local x x2 # Handle common stuff local mycmakeargs=( - $(cmake-utils_use_with jingle GOOGLETALK) - $(cmake-utils_use_with jingle LiboRTP) - $(cmake-utils_use_with jingle Mediastreamer) - $(cmake-utils_use_with jingle Speex) - $(cmake-utils_use_disable v4l VIDEOSUPPORT) + -DWITH_GOOGLETALK=$(usex jingle) + -DWITH_LiboRTP=$(usex jingle) + -DWITH_Mediastreamer=$(usex jingle) + -DWITH_Speex=$(usex jingle) + -DDISABLE_VIDEOSUPPORT=$(usex !v4l) ) # enable protocols for x in ${PROTOCOLS}; do case ${x/+/} in zeroconf) x2=bonjour ;; xmpp) x2=jabber ;; - *) x2='' ;; + *) x2=${x/+/} ;; esac - mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2})) + mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) ) done mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF ) # enable plugins for x in ${PLUGINS}; do - mycmakeargs+=($(cmake-utils_use_with ${x/+/})) + mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) ) done kde4-base_src_configure @@ -150,12 +149,6 @@ src_configure() { pkg_postinst() { kde4-base_pkg_postinst - #if use telepathy; then - # elog "To use kopete telepathy plugins, you need to start gabble first:" - # elog "GABBLE_PERSIST=1 telepathy-gabble &" - # elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'" - #fi - if ! use ssl; then if use xmpp ; then # || use irc; then if ! has_version "app-crypt/qca:2[openssl]" ; then |