gentoo resync : 12.11.2017

4 files changed, 330 insertions, 4 deletions

diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index a84555419173..2b91690954fe 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,9 +1,11 @@
+AUX toxic-0.8.0-verbose-build-log.patch 9264 SHA256 ee3a76ca18dbc476298bb2f49fce2309088fb5a8741c74ea8460c945d566fdaa SHA512 5f3b1e2c20ff04b11ef40eee0953954c0274044aeefa4c4cde5fd4028591ebedc94d671383656d5af219e2d6ed9bf998ba092a821528e80f6617a4cb85ef003d WHIRLPOOL 68310cf35623086ecda1af13ce95ae705c391e54e2f96fdb920979d07b28c464e693759fe7dd7d618f1439d20c3f9604ddb41bfd07d8c2df2d31fa0ff5c5a343
 DIST toxic-0.7.1.tar.gz 1137112 SHA256 414ca2cd369e277872c7248c43f82afa0ac2f6c8fa5fc8e93f7c3e8ab6d11b9c SHA512 c304b07a67ed27a25394590eb8759b5dd957605be4eb9e64590d4580da0977e1cd201e8b95ae1b31e995772560510ceb0643028696e2df69e1f5d0dff575b553 WHIRLPOOL 228193bb78bf38bd5f5f5ff371a87f12561edcb5729337b58198df36e5ec55b99f2c2ca84f5b471846e7f84445f1c5181c5fa71ff287f62d5e34f833a45747d6
 DIST toxic-0.7.2.tar.gz 1136947 SHA256 a2962aca766caf84b52a52e9a5ce2276a9d3906685f565d2a00551e7c2916c59 SHA512 cf3fd0afdc63aa4d2039e08a8f9f32a042a6412f0a242823205fcf058f56e732468389d4bdf614ded8b0d9704b05a315044ee216edd51546501a24be0b6d5b26 WHIRLPOOL 47b5ee57a38084ea7dcff12cac77b05a2d8d486f0ecaffe5e5db11825338a785a96563e10abcb788accea527d2da6f690b326628dd09601d2bf002f69cc60de3
 DIST toxic-0.8.0.tar.gz 1145799 SHA256 4078167ff09a94a78cd46d55163524b0a6692b56a74458c99093b84316a6c604 SHA512 3c59edb61b1bcdbfa3a8391a1a1ceccc6c9c38b49c1709813d60480b180fb39607806116b9dcd1de35ebb02e23e95d78c8191f04a4875e06e27fa43bc9800b33 WHIRLPOOL 3b99ab4720c5360ce531db210a23e830eb99be70836fb7ef9d7604b526f26a7fd92dfd4ab26d1cbdb642371cc98a646aad9f4527b7c2c9f2da50f2347ab7a74e
 EBUILD toxic-0.7.1.ebuild 1021 SHA256 d53365e386652145852eea64b5997aad0c7f02dbf0a33a892fc08835268f5c5c SHA512 812dbd65ffc7666d76b708276df42a3cd97103d413ed877c87ed98fe415c388e17b44bde3a06cb44506e2acf33d7120683c31dee67cad6b7a713845341696280 WHIRLPOOL 5cf559b43901d7ea7d368603226f44d8454799a58b8d955760e9cf1a9c179aa9746d96f984e6dfe57e4bd401c51f0e69be3e745d7c75d77550af60f8866f97ed
 EBUILD toxic-0.7.2-r1.ebuild 1022 SHA256 c1740bcf9fc448f7ea5004c3524097dfa0aaa99c5252f1a70b20c897d7dbafed SHA512 3a9a3a7a9cd916259db815a80c61bbef245a224e806647acebe213fca878e2d05996b3d4d182e6f46a855d51bb2acc1f353fc396d7fe2093efd1b6031cf85989 WHIRLPOOL ca255f361df2db7795812ecb39f25bd153c5060c473adaabb0d9cb0bfd5a8c6d9e8b4249df803384848533b34da98cfdf8ba6edb83f29f96ed06d34148780cb7
 EBUILD toxic-0.7.2.ebuild 1022 SHA256 eb2e6718a27a4ef9001104a01027e37a11df5f199ba1fbd2e39efb96bcb0b0e0 SHA512 02f2715812d23c8a0528cfca01780be03bdf5934cff94500e2bf962c48402c1c43ea578fe8d621e06e2df5ba31076c8bdbf114c71d2dce4622436300099f795a WHIRLPOOL 85debf0460882d1ea914ba304e45e1347a55634362a6110fbce83aa4addba68f350e085fe8d183b9e582d976a94fc209fd40f10ddecda5e96fbee8199dc7de0b
+EBUILD toxic-0.8.0-r1.ebuild 2057 SHA256 5c7316aaaaa9905adce6963ee6747277b05d45280d7061f01d88d9a8fc60f7a6 SHA512 415e828401566250b63a95cd245b61b2237a2081737b6fb6860e031e331fdf309643ed8fc2982eae322d2c1a5bc48be97d49e369cf4a7cfb4f7f02ed8ac29022 WHIRLPOOL bed8bf0b3baaad93a53cea4558c3d28f1aa4ee8edc3977ea0575342ea703462f76d8d16c1c8db3a9b994b37a367ddbe834387cd7a395d961ae41e2b1928735ef
 EBUILD toxic-0.8.0.ebuild 1632 SHA256 d3126b98b5f7dae046d83e9e9fe46430bfc9128a1dd94e011f2b1d24df41c65c SHA512 b19c30c5f38c8e8424a601430086cffa7a02b45416efa02e88853bd411b848ca06648b464f74e8351bf63c66da7cb89c08ad6045447ade6d69eea06269e09b9f WHIRLPOOL 03998ef100e10d59bd54443614bed2cae601fe733352ae0956f19ccecb1bf16b3a64442791fc9b130f20b8d09e3be287b5531f671c475ce1ee8ea22aac4c368e
 MISC ChangeLog 295 SHA256 986413122b4d536037782b78c0c8c01a7bf0e91a366942dfa01ce9bae59e0d7f SHA512 18c184b5553f5886753fb242505c6ae8e8810bc672ed71693650075cfcea8decc5dc899abbc05c208b1757d00f76dffa7492cabfef3d4f7bf17b13c913a9752c WHIRLPOOL 19e1cb6777ae83bc20a87547750e910d57b00282d524339e3c7a2552cb7cc82eee2dc6ac8fbb7b04e3f5880674fe58f3c82d91d8b385da69349ed980f81049bc
-MISC metadata.xml 803 SHA256 6670993ac4ebe7981cf1cd8e41cea60a32b4b609bcba9d9b1c4edd45c9881166 SHA512 98cf29bd18eaa0949e158592961b96d4974ad6c5108cbebff9aeebfc01161831621ca3b058c928de8761d114cd50f7ba8a67709b335d50e1f0771e44de725da6 WHIRLPOOL bb84b5f93303b1387df863ea54d8b99e572c50c4637f0a19e5a807ed81cdb218022bd17d6067e1b98c73ccdfe6408b0f836c25d29d83912d4e909152d3ce605d
+MISC metadata.xml 932 SHA256 a3454b07fc151c7c5f01319208c544214c413e4ef83046367bb5a70cf17952be SHA512 885f4ee1c4974fc1d8db2253aab87b05bb19b0beaac30749123dc16ae10ae6f3296e5c271697cc83bd2a6c48b1a6bbd08b829cf67c859a20fd046390662337b2 WHIRLPOOL 7c56eb23869a4e5df922e9fb75069945cecaa3f3cd4af80047acac853d2795e122dbce2a4d89c77b313a1135adf959c48e736ff8b5158a3d0e3c4f27fdcdf6b4
diff --git a/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch b/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch
new file mode 100644
index 000000000000..ee1c1d90d07d
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.8.0-verbose-build-log.patch
@@ -0,0 +1,230 @@
+This patch creates a 'verbosity' flag to satisfy Gentoo packaging
+standards.
+
+Thanks to Felix Janda for reporting both this issue and other issues
+with the ebuild. Gentoo bug #634350
+
+Most of this patch was generated using:
+
+	sed -e 's:^\(\s\+\)@:\1\$(AT):' $(find -name *.mk)
+
+Verbosity can be activated by using `make V=1`.
+
+Patch authored by zlg, released under GPL3.
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,14 @@ CFG_DIR = $(BASE_DIR)/cfg
+ 
+ -include $(CFG_DIR)/global_vars.mk
+ 
++# Create V for verbosity. Defaults to 0.
++ifndef V
++	V := 0
++endif
++AT_0 := @
++AT_1 :=
++AT = $(AT_$(V))
++
+ LIBS = libtoxcore ncursesw libconfig libqrencode
+ 
+ CFLAGS = -std=gnu99 -pthread -Wall -g -fstack-protector-all
+@@ -59,20 +67,20 @@ OBJ := $(addprefix $(BUILD_DIR)/, $(OBJ))
+ all: $(BUILD_DIR)/toxic
+ 
+ $(BUILD_DIR)/toxic: $(OBJ)
+-	@echo "  LD    $(@:$(BUILD_DIR)/%=%)"
+-	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
++	$(AT)echo "  LD    $(@:$(BUILD_DIR)/%=%)"
++	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/toxic $(OBJ) $(LDFLAGS)
+ 
+ $(BUILD_DIR)/osx_video.o: $(SRC_DIR)/$(OSX_VIDEO)
+-	@echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
+-	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
++	$(AT)echo "  CC    $(@:$(BUILD_DIR)/)osx_video.o"
++	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/osx_video.o -c $(SRC_DIR)/$(OSX_VIDEO)
+ 
+ $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c
+-	@if [ ! -e $(BUILD_DIR) ]; then \
++	$(AT)if [ ! -e $(BUILD_DIR) ]; then \
+ 		mkdir -p $(BUILD_DIR) ;\
+ 	fi
+-	@echo "  CC    $(@:$(BUILD_DIR)/%=%)"
+-	@$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
+-	@$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $(BUILD_DIR)/$*.d
++	$(AT)echo "  CC    $(@:$(BUILD_DIR)/%=%)"
++	$(AT)$(CC) $(CFLAGS) -o $(BUILD_DIR)/$*.o -c $(SRC_DIR)/$*.c
++	$(AT)$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $(BUILD_DIR)/$*.d
+ 
+ clean:
+ 	rm -f $(BUILD_DIR)/*.d $(BUILD_DIR)/*.o $(BUILD_DIR)/toxic
+--- a/apidoc/python/Makefile
++++ b/apidoc/python/Makefile
+@@ -1,6 +1,14 @@
+ # Minimal makefile for Sphinx documentation
+ #
+ 
++# Create V for verbosity. Defaults to 0.
++ifndef V
++	V := 0
++endif
++AT_0 := @
++AT_1 :=
++AT = $(AT_$(V))
++
+ # You can set these variables from the command line.
+ SPHINXOPTS    =
+ SPHINXBUILD   = sphinx-build
+@@ -10,11 +18,11 @@ BUILDDIR      = build
+ 
+ # Put it first so that "make" without argument is like "make help".
+ help:
+-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
++	$(AT)$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+ 
+ .PHONY: help Makefile
+ 
+ # Catch-all target: route all unknown targets to Sphinx using the new
+ # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+ %: Makefile
+-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+\ No newline at end of file
++	$(AT)$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+--- a/cfg/targets/doc.mk
++++ b/cfg/targets/doc.mk
+@@ -2,8 +2,8 @@
+ doc: $(MANFILES:%=$(DOC_DIR)/%)
+ 	
+ $(DOC_DIR)/%: $(DOC_DIR)/%.asc
+-	@echo "  MAN   $(@F)"
+-	@a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
++	$(AT)echo "  MAN   $(@F)"
++	$(AT)a2x -f manpage -a revdate=$(shell git log -1 --date=short --format="%ad" $<) \
+ 		-a manmanual="Toxic Manual" -a mansource=toxic \
+ 		-a manversion=__VERSION__ -a datadir=__DATADIR__ $<
+ 	
+--- a/cfg/targets/help.mk
++++ b/cfg/targets/help.mk
+@@ -1,24 +1,24 @@
+ # Help target
+ help:
+-	@echo "-- Targets --"
+-	@echo "  all:       Build toxic and documentation [DEFAULT]"
+-	@echo "  toxic:     Build toxic"
+-	@echo "  doc:       Build documentation"
+-	@echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
+-	@echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
+-	@echo "  clean:     Remove built files"
+-	@echo "  help:      This help"
+-	@echo
+-	@echo "-- Variables --"
+-	@echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
+-	@echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
+-	@echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
+-	@echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
+-	@echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
+-	@echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
+-	@echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
+-	@echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
+-	@echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
+-	@echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
++	$(AT)echo "-- Targets --"
++	$(AT)echo "  all:       Build toxic and documentation [DEFAULT]"
++	$(AT)echo "  toxic:     Build toxic"
++	$(AT)echo "  doc:       Build documentation"
++	$(AT)echo "  install:   Build toxic and install it in PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
++	$(AT)echo "  uninstall: Remove toxic from PREFIX (default PREFIX is \"$(abspath $(PREFIX))\")"
++	$(AT)echo "  clean:     Remove built files"
++	$(AT)echo "  help:      This help"
++	$(AT)echo
++	$(AT)echo "-- Variables --"
++	$(AT)echo "  DISABLE_X11:            Set to \"1\" to force building without X11 support"
++	$(AT)echo "  DISABLE_AV:             Set to \"1\" to force building without audio call support"
++	$(AT)echo "  DISABLE_SOUND_NOTIFY:   Set to \"1\" to force building without sound notification support"
++	$(AT)echo "  DISABLE_DESKTOP_NOTIFY: Set to \"1\" to force building without desktop notifications support"
++	$(AT)echo "  DISABLE_QRPNG:          Set to \"1\" to force building without QR exported as PNG support"
++	$(AT)echo "  ENABLE_PYTHON:          Set to \"1\" to enable building with Python scripting support"
++	$(AT)echo "  USER_CFLAGS:            Add custom flags to default CFLAGS"
++	$(AT)echo "  USER_LDFLAGS:           Add custom flags to default LDFLAGS"
++	$(AT)echo "  PREFIX:                 Specify a prefix directory for binaries, data files,... (default is \"$(abspath $(PREFIX))\")"
++	$(AT)echo "  DESTDIR:                Specify a directory where to store installed files (mainly for packaging purpose)"
+ 
+ .PHONY: help
+--- a/cfg/targets/install.mk
++++ b/cfg/targets/install.mk
+@@ -1,29 +1,29 @@
+ # Install target
+ install: $(BUILD_DIR)/toxic
+-	@echo "Installing toxic executable"
+-	@mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
+-	@install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
++	$(AT)echo "Installing toxic executable"
++	$(AT)mkdir -p $(abspath $(DESTDIR)/$(BINDIR))
++	$(AT)install -m 0755 $(BUILD_DIR)/toxic $(abspath $(DESTDIR)/$(BINDIR)/toxic)
+ 	
+-	@echo "Installing desktop file"
+-	@mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
+-	@install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
++	$(AT)echo "Installing desktop file"
++	$(AT)mkdir -p $(abspath $(DESTDIR)/$(APPDIR))
++	$(AT)install -m 0644 $(MISC_DIR)/$(DESKFILE) $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
+ 	
+-	@echo "Installing data files"
+-	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
+-	@for f in $(DATAFILES) ; do \
++	$(AT)echo "Installing data files"
++	$(AT)mkdir -p $(abspath $(DESTDIR)/$(DATADIR))
++	$(AT)for f in $(DATAFILES) ; do \
+ 		install -m 0644 $(MISC_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+ 		file=$(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+ 		sed -e 's:__DATADIR__:'$(abspath $(DATADIR))':g' $$file > temp_file && \
+ 		mv temp_file $$file ;\
+ 	done
+-	@mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
+-	@for f in $(SNDFILES) ; do \
++	$(AT)mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds
++	$(AT)for f in $(SNDFILES) ; do \
+ 		install -m 0644 $(SND_DIR)/$$f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
+ 	done
+ 	
+-	@echo "Installing man pages"
+-	@mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
+-	@for f in $(MANFILES) ; do \
++	$(AT)echo "Installing man pages"
++	$(AT)mkdir -p $(abspath $(DESTDIR)/$(MANDIR))
++	$(AT)for f in $(MANFILES) ; do \
+ 		if [ ! -e "$(DOC_DIR)/$$f" ]; then \
+ 			continue ;\
+ 		fi ;\
+--- a/cfg/targets/uninstall.mk
++++ b/cfg/targets/uninstall.mk
+@@ -1,21 +1,21 @@
+ # Uninstall target
+ uninstall:
+-	@echo "Removing toxic executable"
+-	@rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
++	$(AT)echo "Removing toxic executable"
++	$(AT)rm -f $(abspath $(DESTDIR)/$(BINDIR)/toxic)
+ 	
+-	@echo "Removing desktop file"
+-	@rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
++	$(AT)echo "Removing desktop file"
++	$(AT)rm -f $(abspath $(DESTDIR)/$(APPDIR)/$(DESKFILE))
+ 	
+-	@echo "Removing data files"
+-	@for f in $(DATAFILES) ; do \
++	$(AT)echo "Removing data files"
++	$(AT)for f in $(DATAFILES) ; do \
+ 		rm -f $(abspath $(DESTDIR)/$(DATADIR)/$$f) ;\
+ 	done
+-	@for f in $(SNDFILES) ; do \
++	$(AT)for f in $(SNDFILES) ; do \
+ 		rm -f $(abspath $(DESTDIR)/$(DATADIR)/sounds/$$f) ;\
+ 	done
+ 	
+-	@echo "Removing man pages"
+-	@for f in $(MANFILES) ; do \
++	$(AT)echo "Removing man pages"
++	$(AT)for f in $(MANFILES) ; do \
+ 		section=$(abspath $(DESTDIR)/$(MANDIR))/man`echo $$f | rev | cut -d "." -f 1` ;\
+ 		file=$$section/$$f ;\
+ 		rm -f $$file $$file.gz ;\
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 4a6dc2b64633..4581d36bbd50 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -13,11 +13,13 @@
 		<remote-id type="github">jfreegman/toxic</remote-id>
 	</upstream>
 	<longdescription lang="en">
-		An ncurses-based Tox client written in C. Supports audio calling, file sharing, and desktop notifications.
+		An ncurses-based Tox client written in C. Supports audio and video calling, file sharing, and desktop notifications.
 	</longdescription>
 	<use>
-		<flag name="notifications">Enables desktop notifications with libnotify</flag>
-		<flag name="av">Enables audio calling and/or audio notifications</flag>
+		<flag name="audio">Enables audio calling</flag>
+		<flag name="av">Enables audio/video functionality (deprecated)</flag>
+		<flag name="notifications">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>
+		<flag name="video">Enables video calling</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/toxic/toxic-0.8.0-r1.ebuild b/net-im/toxic/toxic-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..e9a1018aa90b
--- /dev/null
+++ b/net-im/toxic/toxic-0.8.0-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox."
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X +audio notifications +python +qrcode +video"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not a typo; net-libs/tox only has a 'both or neither' option
+RDEPEND="
+	|| (
+	audio? ( net-libs/tox:0/0.1[av] )
+	video? ( net-libs/tox:0/0.1[av] )
+	net-libs/tox:0/0.1
+	)
+	dev-libs/libconfig
+	net-misc/curl:0=
+	sys-libs/ncurses:0=
+	audio? ( media-libs/openal media-libs/freealut )
+	video? ( media-libs/libvpx:= x11-libs/libX11 )
+	notifications? ( x11-libs/libnotify )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-verbose-build-log.patch"
+	)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# bug 630370: version string correction 0.7.2 -> 0.8.0
+	# REMOVE THIS FOR toxic != 0.8.0
+	sed -i \
+		-e 's/^\(TOXIC_VERSION =\).*$/\1 0.8.0/' \
+		cfg/global_vars.mk || die "Version string correction failed."
+}
+
+src_configure() {
+	export USER_CFLAGS="${CFLAGS}"
+	export USER_LDFLAGS="${LDFLAGS}"
+	if ! use video && ! use audio; then
+		export DISABLE_AV=1
+	fi
+	if ! use audio; then
+		export DISABLE_SOUND_NOTIFY=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	if ! use notifications; then
+		export DISABLE_DESKTOP_NOTIFY=1
+	fi
+	if ! use qrcode; then
+		export DISABLE_QRPNG=1
+	fi
+	if use python; then
+		export ENABLE_PYTHON=1
+	fi
+	sed -i \
+		-e "s,/usr/local,${EPREFIX}/usr,g" \
+		cfg/global_vars.mk || die "PREFIX sed failed"
+}
+
+src_compile() {
+	emake V=1 || die "emake failed"
+}
+
+src_install() {
+	default
+	if ! use audio; then
+		rm -r "${ED%/}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}