diff options
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/blight/blight-9999.ebuild | 15 | ||||
| -rw-r--r-- | net-im/blight/files/blight-9999.patch | 24 | ||||
| -rw-r--r-- | net-im/gtox/gtox-9999.ebuild | 56 | ||||
| -rw-r--r-- | net-im/gtox/metadata.xml | 7 | ||||
| -rw-r--r-- | net-im/qtox/metadata.xml | 5 | ||||
| -rw-r--r-- | net-im/qtox/qtox-9999.ebuild | 39 | ||||
| -rw-r--r-- | net-im/ratox/ratox-9999.ebuild | 2 | ||||
| -rw-r--r-- | net-im/toxic/metadata.xml | 3 | ||||
| -rw-r--r-- | net-im/toxic/toxic-9999.ebuild | 39 | ||||
| -rw-r--r-- | net-im/utox/metadata.xml | 4 | ||||
| -rw-r--r-- | net-im/utox/utox-9999.ebuild | 18 |
11 files changed, 38 insertions, 174 deletions
diff --git a/net-im/blight/blight-9999.ebuild b/net-im/blight/blight-9999.ebuild index 3648b627..ce4a0b83 100644 --- a/net-im/blight/blight-9999.ebuild +++ b/net-im/blight/blight-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils git-2 +inherit git-2 DESCRIPTION="Cross-platform graphical user interface for Tox written in Racket" HOMEPAGE="https://github.com/lehitoskin/blight" @@ -14,22 +14,19 @@ LICENSE="GPL-3" SLOT="0" RDEPEND="net-libs/tox - >=dev-db/sqlite-3.8.6 - >=dev-scheme/racket-6.0.1[X] - dev-scheme/libtoxcore-racket - dev-scheme/libopenal-racket" + >=dev-db/sqlite-3.8.2 + >=dev-scheme/racket-6.0.1[X]" src_prepare() { + raco pkg install --no-setup github://github.com/lehitoskin/libtoxcore-racket/master epatch "$FILESDIR/${P}.patch" epatch_user } src_compile() { - emake blight - emake blight-repl + emake } src_install() { - emake DESTDIR="${D}/usr" install-blight - emake DESTDIR="${D}/usr" install-repl + emake DESTDIR="${D}/usr" install } diff --git a/net-im/blight/files/blight-9999.patch b/net-im/blight/files/blight-9999.patch index 2451b6ab..e47640b1 100644 --- a/net-im/blight/files/blight-9999.patch +++ b/net-im/blight/files/blight-9999.patch @@ -1,7 +1,7 @@ diff -Naur a/config.rkt b/config.rkt ---- a/config.rkt 2014-12-14 18:49:30.181361600 -0800 -+++ b/config.rkt 2014-12-14 18:52:13.599355467 -0800 -@@ -65,7 +65,7 @@ +--- a/config.rkt 2014-05-30 17:05:42.212974487 -0700 ++++ b/config.rkt 2014-05-30 17:09:20.788966204 -0700 +@@ -26,7 +26,7 @@ ; location of sound directory (currently depends on running from same dir ; change to /usr/share/blight/sounds (or something) once a proper ; installer is to be had @@ -10,21 +10,3 @@ diff -Naur a/config.rkt b/config.rkt ; list of sound files (define sounds (list (build-path sound-dir "New Message.wav") -@@ -86,7 +86,7 @@ - (define make-noise-default #t) - - ; blight icons for the buddy list --(define icon-dir (build-path "icons")) -+(define icon-dir (build-path "/usr/share/blight/icons")) - ; list of icon files - (define icons (list - (build-path icon-dir "offline.png") -@@ -97,7 +97,7 @@ - - (define avatar-dir (build-path tox-path "avatars")) - --(define logo-dir (build-path "img")) -+(define logo-dir (build-path "/usr/share/icons/hicolor/128x128/apps")) - - (define logo (build-path logo-dir "blight-logo-128px.png")) - diff --git a/net-im/gtox/gtox-9999.ebuild b/net-im/gtox/gtox-9999.ebuild deleted file mode 100644 index 45661958..00000000 --- a/net-im/gtox/gtox-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils git-2 cmake-utils - -DESCRIPTION="A GTK3 Tox-Client" -HOMEPAGE="https://github.com/kokutoru/gtox" -SRC_URI="" -EGIT_REPO_URI="git://github.com/kokutoru/gtox.git" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -#IUSE="+filter_audio gtk X" - -DEPEND=" - dev-util/cmake - >=sys-devel/gcc-4.9.0 - >=dev-cpp/gtkmm-3.16.0 - dev-libs/atk - dev-libs/glib:2 - dev-cpp/glibmm - dev-libs/flatbuffers - x11-libs/gtk+:3 - x11-libs/cairo[X] - x11-libs/pango[X] - x11-libs/libnotify - gnome-base/librsvg - dev-db/sqlite:3 - sys-devel/gettext - media-libs/libcanberra[gtk3,sound] - >=dev-cpp/gstreamermm-1.0.10 - net-libs/tox[av] - x11-libs/libX11" -RDEPEND="${DEPEND}" - -CMAKE_USE_DIR="${S}/src" - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install -} diff --git a/net-im/gtox/metadata.xml b/net-im/gtox/metadata.xml deleted file mode 100644 index cc3fe249..00000000 --- a/net-im/gtox/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>maintainer-wanted@gentoo.org</email> - </maintainer> -</pkgmetadata> diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml index cd6cad4e..1ed9f4e7 100644 --- a/net-im/qtox/metadata.xml +++ b/net-im/qtox/metadata.xml @@ -5,9 +5,4 @@ <email>simon-github@slevermann.de</email> <name>Simon Levermann</name> </maintainer> - <use> - <flag name="filter_audio">Adds support for filtering audio input</flag> - <flag name="gtk">Adds support for GTK and Status Notifier tray backends</flag> - <flag name="X">Adds support for X11</flag> - </use> </pkgmetadata> diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild index 1df981a5..0fc8ffaf 100644 --- a/net-im/qtox/qtox-9999.ebuild +++ b/net-im/qtox/qtox-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -14,39 +14,26 @@ EGIT_REPO_URI="git://github.com/tux3/qtox.git" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="+filter_audio gtk X" +IUSE="" DEPEND=" - dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 - dev-qt/qtgui:5[gif,jpeg,png,xcb] + dev-qt/qtgui:5[gif,jpeg,png] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 dev-qt/qtxml:5 - filter_audio? ( media-libs/libfilteraudio ) - media-gfx/qrencode media-libs/openal - >=media-video/ffmpeg-2.6.3[webp,v4l] - gtk? ( dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf[X] - x11-libs/gtk+:2 - x11-libs/cairo[X] - x11-libs/pango[X] ) - net-libs/tox[av] - X? ( x11-libs/libX11 - x11-libs/libXScrnSaver )" + media-libs/opencv[-qt4,v4l] + net-libs/tox[av]" RDEPEND="${DEPEND}" pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(tc-getCXX) == *g++ ]] ; then if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 || $(gcc-major-version) -lt 4 ]] ; then - eerror "You need at least sys-devel/gcc-4.8.3" - die "You need at least sys-devel/gcc-4.8.3" + eerror "You need at least sys-devel/gcc-4.8.0" + die "You need at least sys-devel/gcc-4.8.0" fi fi fi @@ -57,17 +44,11 @@ src_prepare() { } src_configure() { - use filter_audio || NO_FILTER_AUDIO="DISABLE_FILTER_AUDIO=YES" - use gtk || NO_GTK_SUPPORT="ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO" - use X || NO_X_SUPPORT="DISABLE_PLATFORM_EXT=YES" - eqmake5 \ - ${NO_FILTER_AUDIO} \ - ${NO_GTK_SUPPORT} \ - ${NO_X_SUPPORT} + eqmake5 } src_install() { dobin "${S}/qtox" - doicon -s scalable "${S}/img/icons/qtox.svg" - domenu "${S}/qTox.desktop" + doicon -s scalable "${FILESDIR}"/tox.svg + make_desktop_entry "qtox" "qTox" "/usr/share/icons/hicolor/scalable/apps/tox.svg" "Network" } diff --git a/net-im/ratox/ratox-9999.ebuild b/net-im/ratox/ratox-9999.ebuild index b5c23cad..2799f959 100644 --- a/net-im/ratox/ratox-9999.ebuild +++ b/net-im/ratox/ratox-9999.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit eutils git-2 +inherit git-2 DESCRIPTION=" A minimal FIFO based client for Tox" HOMEPAGE="http://git.2f30.org/ratox" diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml index 9a010970..35db8749 100644 --- a/net-im/toxic/metadata.xml +++ b/net-im/toxic/metadata.xml @@ -6,10 +6,7 @@ <name>holgersson</name> </maintainer> <use> - <flag name="av">Enable audio support</flag> <flag name="libnotify">Enable desktop notification support.</flag> <flag name="sound-notify">Adds support for sound notifications.</flag> - <flag name="X">Adds support for X11</flag> - </use> </pkgmetadata> diff --git a/net-im/toxic/toxic-9999.ebuild b/net-im/toxic/toxic-9999.ebuild index ae38dc3f..dbb19fd1 100644 --- a/net-im/toxic/toxic-9999.ebuild +++ b/net-im/toxic/toxic-9999.ebuild @@ -4,28 +4,26 @@ EAPI=5 -inherit autotools eutils git-2 toolchain-funcs +inherit autotools git-2 toolchain-funcs DESCRIPTION="CLI Frontend for Tox" -HOMEPAGE="https://wiki.tox.chat/clients/toxic" +HOMEPAGE="http://wiki.tox.im/Toxic" SRC_URI="" EGIT_REPO_URI="git://github.com/Tox/toxic https://github.com/Tox/toxic" LICENSE="GPL-3" SLOT="0" -IUSE="+av +libnotify +sound-notify +X" +IUSE="+libnotify +sound-notify" RDEPEND=" - av? ( - media-libs/openal - net-libs/tox[av] ) - !av? ( net-libs/tox ) - libnotify? ( x11-libs/libnotify ) - sound-notify? ( media-libs/freealut ) - X? ( x11-libs/libX11 ) + dev-libs/libconfig + net-libs/tox[av] + media-libs/openal sys-libs/ncurses - dev-libs/libconfig" + x11-libs/libX11 + libnotify? ( x11-libs/libnotify ) + sound-notify? ( media-libs/freealut )" DEPEND="${RDEPEND} app-text/asciidoc virtual/pkgconfig" @@ -34,34 +32,23 @@ src_prepare() { # verbose build sed -i \ -e 's/@$(CC)/$(CC)/' \ - Makefile || die + build/Makefile || die epatch_user } src_compile() { - use av || export AV="DISABLE_AV=1" use libnotify || export NOTIFY="DISABLE_DESKTOP_NOTIFY=1" use sound-notify || export SOUND_NOTIFY="DISABLE_SOUND_NOTIFY=1" - use X || export X="DISABLE_X11=1" emake \ CC="$(tc-getCC)" \ USER_CFLAGS="${CFLAGS}" \ USER_LDFLAGS="${LDFLAGS}" \ - PREFIX="/usr" ${NOTIFY} ${SOUND_NOTIFY} ${X} ${AV} + PREFIX="/usr" ${NOTIFY} ${SOUND_NOTIFY} \ + -C build } src_install() { - use av || export AV="DISABLE_AV=1" - use libnotify || export NOTIFY="DISABLE_DESKTOP_NOTIFY=1" - use sound-notify || export SOUND_NOTIFY="DISABLE_SOUND_NOTIFY=1" - use X || export X="DISABLE_X11=1" - - # ↑ needed workaround, without it "missing" things may compile again in install() –.–" - - emake \ - install PREFIX="/usr" DESTDIR="${D}" \ - ${NOTIFY} ${SOUND_NOTIFY} ${X} ${AV} # part of workaround - + emake install PREFIX="/usr" DESTDIR="${D}" -C build } pkg_postinst() { diff --git a/net-im/utox/metadata.xml b/net-im/utox/metadata.xml index 8c7121dd..cc3fe249 100644 --- a/net-im/utox/metadata.xml +++ b/net-im/utox/metadata.xml @@ -4,8 +4,4 @@ <maintainer> <email>maintainer-wanted@gentoo.org</email> </maintainer> - <use> - <flag name="dbus">Adds dbus support for desktop notifications</flag> - <flag name="filter_audio">Adds support for filtering audio input</flag> - </use> </pkgmetadata> diff --git a/net-im/utox/utox-9999.ebuild b/net-im/utox/utox-9999.ebuild index 77c583a8..41676f8e 100644 --- a/net-im/utox/utox-9999.ebuild +++ b/net-im/utox/utox-9999.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -inherit eutils fdo-mime git-2 gnome2-utils toolchain-funcs +inherit fdo-mime gnome2-utils toolchain-funcs git-2 DESCRIPTION="Lightweight Tox client" -HOMEPAGE="https://github.com/notsecure/uTox" +HOMEPAGE="https://github.com/notsecure/uTox.git" EGIT_REPO_URI="git://github.com/notsecure/uTox.git https://github.com/notsecure/uTox.git" LICENSE="GPL-3" SLOT="0" -IUSE="+dbus +filter_audio" +IUSE="+dbus" RDEPEND="net-libs/tox[av] media-libs/freetype - filter_audio? ( media-libs/libfilteraudio ) media-libs/libv4l media-libs/libvpx media-libs/openal @@ -32,10 +31,6 @@ src_prepare() { } src_configure() { - if use filter_audio && [ "${PROFILE_IS_HARDENED}" = 1 ]; then - ewarn "Building µTox with support for filter_audio using hardened profile results in" - ewarn "crash upon start. For details, see https://github.com/notsecure/uTox/issues/844" - fi # respect CFLAGS sed -i \ -e '/CFLAGS/s# -g ##' \ @@ -43,10 +38,7 @@ src_configure() { } src_compile() { - emake \ - CC="$(tc-getCC)" \ - DBUS=$(usex dbus "1" "0") \ - FILTER_AUDIO=$(usex filter_audio "1" "0") + emake CC="$(tc-getCC)" DBUS=$(usex dbus "1" "0") } src_install() { |