We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

changeset 165:676a84c72a2f

merged heads
author gsnerf <gsnerf@gsnerf.de>
date Thu, 16 Jun 2016 21:45:39 +0200
parents 2d853a2caaf5 (current diff) 8db459a54e9e (diff)
children 58a9a20ec12f
files dev-vcs/kallithea/kallithea-0.3.1.ebuild
diffstat 8 files changed, 317 insertions(+), 432 deletions(-) [+]
line wrap: on
line diff
--- a/dev-vcs/kallithea/Manifest	Thu Jun 16 21:45:15 2016 +0200
+++ b/dev-vcs/kallithea/Manifest	Thu Jun 16 21:45:39 2016 +0200
@@ -1,6 +1,4 @@
 AUX production.wsgi 448 SHA256 34aa607585b8526356d0a4e7103689a4c353e333bfd7dbd9316dea1601403af6 SHA512 f1d6310626ce5687317d856e4be2ea37d4d39dea5402846c64195d77cef1454ef96d3c6d23832a9a0c8ecdc6645582bc86b138cc7fbb7dc78226f45279d44f7a WHIRLPOOL cfee76d169facea538b00fdd9683a9ecefe58cd49f3c2f3f46e49025af459e5a8bdd236ea55252d5488ee52212f2f57423f3d8e21ddb2251e25851bffc93d243
 AUX start-virtualenv.sh 463 SHA256 2f5def6c4840b94b78055fcc3f3e37aa42dd709e4e71dfa16d1fc63966274456 SHA512 0912644b3806b9c04d301f5f2f59c9b212549e73dec848a324fb0dd8bc9410e60750a571a3438ccc4b9dd940020986b67a9f3bb29a7fd27945daa2ae4c24139d WHIRLPOOL f4cbb8e583ec907baaa0801c6c2f73a9832689422654661079d420002a6c55ff872f8af1b4a2b78e50085f90e2c8d5876e93a436c443ac75f9d589510d8f615c
-DIST Kallithea-0.3.1.tar.bz2 5320317 SHA256 9c6cac42d99da475af63012265f986c4d743a07e81c18f4744b3bf8be84aad7d SHA512 09bf8552d00176258dc2f00fc8a186bb95e0f12b535db836bf6a404bc41821805c144056af76f69eec66926ce3226ba0a6b3776abb8d717f5bbe5b33faa81beb WHIRLPOOL d05b0cbf7f9613571116efc10a0d99b1944c2c2ae4ede37dfde074120839bd40c2c0708f5028e2018f9d1fb4a24a7ef42b84f211c1fdef13200b2b7ee765f85f
 DIST Kallithea-0.3.2.tar.gz 5347665 SHA256 891a7f88cf02a887c8eb711bfe56ff79f053a9051e0748fc29293bc7fa6ef0b3 SHA512 6f0cbab03004ea776e7278470ce12c025ba252b2194fc93c2dc5f3675811ca01306fd7ca076f1248915f22265d03d94741f2fdb7edeb8a90425e9d297a7f6af4 WHIRLPOOL ee0249a7563271ed94cc0a04ed1e90508854573a2395909e8525da19be68c04ed9b8c6968f47e76b86c6fa697a8fbf4c316fdd210caea4550655201a80bc360e
-EBUILD kallithea-0.3.1.ebuild 15574 SHA256 39100b90969c6e9ec680945b58ddf1be7aa82aa8cc306504a54f4ee8bbddfe10 SHA512 6699618095dd56fcde7f8b1e6a9614b0a725817580b2548525fc2b54673b29d817092fa5f672532737b375aeabae32eebfad016c6b8d109b2e18c921b06ca272 WHIRLPOOL 78e8a4b7387fe9528682d9ad4167b5c93d451434c131bbdf37a109a9e72758643539f393aa7463d090858e2215ddca1b88b56d3e60f26baa7b85364c2cb46caf
 EBUILD kallithea-0.3.2.ebuild 15573 SHA256 d84b9f260eb6a5af551b5def59a89340366927dd1af0936b755fc885fcc11366 SHA512 13f3843d33cef3fce28e0e3e46999b407020a0f2fdc86baa05dac093a89881a453686ab5f7902567e5f33ef9670bb484465f6eaface3e74779e8d40d4dce5646 WHIRLPOOL 6deb4b03e56cf171403c6f92a9cab17e4eef4acb5791d76ac08a2b57806b923317e6b41110eaed3d9a6534ed5dee1b6beb883b80ae504a61ac74f2a0ae69c3ac
--- a/dev-vcs/kallithea/kallithea-0.3.1.ebuild	Thu Jun 16 21:45:15 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,419 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-### NOTES ##########################################################################
-#
-# When updating this ebuild, comment out all workarounds and try without them first.
-# Only re-enable them if they are still required.
-#
-# Also check that documentation URLs are still correct.
-#
-####################################################################################
-
-EAPI="5"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit user
-
-DESCRIPTION="a web-based frontend and middleware to Mercurial and Git repositories"
-HOMEPAGE="https://kallithea-scm.org/"
-SRC_URI="https://pypi.python.org/packages/49/14/3b479b06e27aaa5b8552da33d8bfd2d4259941ce0d159d188528d4902853/Kallithea-0.3.1.tar.bz2"
-
-IUSE="+git mysql postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/virtualenv
-	git? ( dev-vcs/git )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-lang/python:2.7[sqlite] )
-"
-	#mysql? ( virtual/libmysqlclient )
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-apps/sed"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-installDataPath="/var/lib/kallithea"
-installBasePath="/opt/kallithea"
-installConfigPath="/etc/kallithea"
-virtualenvActivationPath="bin/activate"
-
-urlDocumentationSetup="http://kallithea.readthedocs.org/en/${PV}/setup.html"
-urlDocumentationRhodeCode="http://kallithea.readthedocs.org/en/${PV}/readme.html#converting-from-rhodecode"
-urlDocumentationMegacoffee="http://gentoo-overlay.megacoffee.net/s/docs-kallithea-apache-mod_wsgi"
-
-pkg_setup() {
-	# create user and group
-	enewgroup kallithea
-	enewuser kallithea -1 -1 "${installDataPath}" kallithea 
-}
-
-src_unpack() {
-	unpack ${A}
-	mv Kallithea-${PV} kallithea-${PV} || die "Unexpected directory structure, aborting..."
-}
-
-src_compile() {
-	# not really compiling anything
-	
-	realWorkDir=$(pwd)
-	
-	# create new virtual environment
-	virtualenv --python=python2.7 --no-site-packages dist/v
-	
-	# activate environment
-	source "dist/v/${virtualenvActivationPath}"
-	
-	# WORKAROUND:
-	# we need to make sure we have a current version of setuptools to install Kallithea's dependencies
-	pip2.7 install 'setuptools>=17.1' || die "Failed to install setuptools, aborting!"
-
-	# WORKAROUND:
-	# _after_ installation on --config we need a certain version of paster to create the initial config file...
-	pip2.7 install 'PasteScript==2.0.2' || die "Failed to install PasteScript, aborting!"
-	
-	# WORKAROUND:
-	# Kallithea's attempt to install Mercurial fails, so we do it first
-	pip2.7 install 'mercurial>=2.9,<3.8' || die "Failed to install Mercurial, aborting!"
-	
-	# WORKAROUND:
-	# Kallithea needs psycopg2 for PostgreSQL support which is not currently listed as a dependency?!
-	# at the time of writing 2.6.1 is current, so we limit the version to <2.7
-	if use postgres ; then
-		pip2.7 install 'psycopg2>=2.6,<2.7' || die "Failed to install psycopg2 (required for PostgreSQL support), aborting!"
-	fi
-	
-	# WORKAROUND:
-	# Kallithea needs MySQLdb for MySQL support which is not currently listed as a dependency?!
-	# at the time of writing 1.2.5 is current, so we limit the version to <1.3
-	if use mysql ; then
-		pip2.7 install 'MySQL-python>=1.2,<1.3' || die "Failed to install MySQL-python (required for MySQL support), aborting!"
-	fi
-	
-	# perform automatic installation, includes dependencies
-	echo
-	echo "===> output by Kallithea's setup.py"
-	python2.7 setup.py install
-	retval=$?
-	echo "<=== Kallithea's setup.py is done, resuming ebuild code"
-	echo
-	
-	# quit now if failed
-	if [ ${retval} -ne 0 ]; then
-		echo "Bad return value ${retval} from setup.py install"
-		exit 1
-	fi
-	
-	# unzip all eggs
-	echo 'Unzipping all eggs...'
-	cd dist/v/lib/python2.7/site-packages/ || die "site-packages not found"
-	for eggname in *.egg; do
-		if [ -f "${eggname}" ]; then
-			mv "${eggname}" tmp.extract.zip
-			unzip -d "${eggname}" tmp.extract.zip
-			rm tmp.extract.zip
-		fi
-	done
-	
-	# disable Git support according to manual
-	# see: http://kallithea.readthedocs.org/en/0.3.1/usage/vcs_support.html
-	if ! use git ; then
-		sed -i -e "/^BACKENDS\s*=\s*{/,/}/ s/^\(\s*\)\('git'\)/\1#\2/" Kallithea-${PV}-py2.7.egg/kallithea/__init__.py || die 'Failed to disable git support, aborting...'
-	fi
-	
-	# create config
-	mkdir "${realWorkDir}/etc"
-	cd "${realWorkDir}/etc"
-	paster make-config Kallithea production.ini || die "unable to create configuration file"
-	
-	# rewrite config to refer to correct default paths
-	sed -i -e "s/%(here)s\(\/\(tarballcache\|data\)\)/${installDataPath//\//\\/}\1/" production.ini
-	sed -i -e "s/%(here)s\(\/kallithea.db\)/${installDataPath//\//\\/}\1/" production.ini
-	
-	# rewrite config to only log from WARN level to "console"
-	# By Kallithea defaults, handler_console logs everything from INFO level to "console".
-	# As mod_wsgi logs everything from "console" to error_log this results in a huge amount
-	# of unnecessary log entries which we would like to prevent.
-	# NOTE: As sed syntax is hard to read... this replacement rule is prefixed with an "address" which
-	#       is being defined by two regexps, effectively restricting replacements just to the
-	#       handler_console section of our ini file.
-	sed -i -e '/^\[handler_console\]/,/^\[/ s/level\s*=\s*INFO/level = WARN/' production.ini
-	
-	# rewrite config to disable debug mode
-	# By default, Kallithea uses debug = true which should *NOT* be used except during development.
-	# See: http://kallithea.readthedocs.org/en/0.3.1/usage/debugging.html
-	sed -i -e '/^\[DEFAULT\]/,/^\[/ s/\(debug\s*=\s*\)true/\1false/' production.ini
-	
-	## (disabled, does not work from sandbox)
-	## maintain system-unique variables from previous production.ini if available
-	#previousProductionConfig="${installConfigPath}/production.ini"
-	#if [ -e "${previousProductionConfig}" ]; then
-	#	previousAppInstanceUUID="$(grep -oE '^\s*app_instance_uuid\s*=\s*[0-9a-f\-]+' /etc/kallithea/production.ini | cut -d'=' -f2 | tr -d ' ')"
-	#	previousBeakerSessionSecret="$(grep -oE '^\s*beaker\.session\.secret\s*=\s*[0-9a-f\-]+' "${previousProductionConfig}" | cut -d'=' -f2 | tr -d ' ')"
-	#	
-	#	if [ ! -z "${previousAppInstanceUUID}" ]; then
-	#		echo 'Transferring previous app instance UUID to new production.ini'
-	#		sed -i -e "s/^\(\s*app_instance_uuid\s*=\s*\).*/\1${previousAppInstanceUUID}/" production.ini
-	#	fi
-	#	
-	#	if [ ! -z "${previousBeakerSessionSecret}" ]; then
-	#		echo 'Transferring previous Beaker session secret to new production.ini'
-	#		sed -i -e "s/^\(\s*beaker\.session\.secret\s*=\s*\).*/\1${previousBeakerSessionSecret}/" production.ini
-	#	fi
-	#fi
-	
-	# remove newly generated UUID and Beaker session secret from config
-	# as user should configure that instead and config diffs don't show
-	# unnecessary stuff
-	sed -i -e "s/^\(\s*app_instance_uuid\s*=\).*/#\1 (run uuidgen and insert the returned UUID here)/" production.ini
-	sed -i -e "s/^\(\s*beaker\.session\.secret\s*=\).*/#\1 (run uuidgen and insert the returned UUID here)/" production.ini
-	
-	# comment out sqlite DB as we don't want users to use it by accident
-	sed -i -e 's/^\(\s*\)\(sqlalchemy\.db1\.url\s*=\s*sqlite:.*\)/\1#\2/' production.ini
-	
-	# rename production.ini as it requires more configuration and is hard to read
-	mv production.ini production.ini.example
-	
-	# rewrite virtualenv directory to later installation directory
-	oldIFS="${IFS}"
-	IFS="
-	"
-	echo "Searching files that need to have paths replaced when leaving portage sandbox..."
-	dirtyFiles=$(grep -Ri "${realWorkDir}/dist/v" ${realWorkDir}/dist/v | grep -vE '^Binary' | cut -d':' -f1 | sort | uniq)
-	for dirtyFile in ${dirtyFiles}; do
-		echo "    patching ${dirtyFile}"
-		sed -e "s#${realWorkDir}/dist/v#${installBasePath}#" -i "${dirtyFile}"
-	done
-	IFS="${oldIFS}"
-	
-	# create WSGI file
-	cd "${realWorkDir}/etc"
-	cp "${FILESDIR}/production.wsgi" .
-	sed -e "s:###BASEDIR###:${installBasePath}:" -i production.wsgi
-	sed -e "s:###DATADIR###:${installDataPath}:" -i production.wsgi
-	sed -e "s:###CONFDIR###:${installConfigPath}:" -i production.wsgi
-}
-
-src_install() {
-	# QA: no need to have anything world-writable...
-	chmod o-w -R dist/v/lib/python2.7/site-packages/
-	
-	# just copy the virtualenv directory to /opt/kallithea
-	dodir /opt
-	cp -aR "${S}/dist/v" "${D}${installBasePath}"
-	
-	# install configuration files to /etc/kallithea
-	diropts -m750 -oroot -gkallithea
-	insopts -m640 -oroot -gkallithea
-	insinto "${installConfigPath}"
-	doins "${S}/etc/production.ini.example"
-	insopts -m644 -oroot -gkallithea
-	doins "${S}/etc/production.wsgi"
-	
-	# create data directory and subdirectories
-	diropts -m2770 -okallithea -gkallithea
-	keepdir "${installDataPath}"
-	keepdir "${installDataPath}/data"
-	keepdir "${installDataPath}/data/cache"
-	keepdir "${installDataPath}/data/cache/data"
-	keepdir "${installDataPath}/data/cache/lock"
-	keepdir "${installDataPath}/data/index"
-	keepdir "${installDataPath}/repositories"
-	keepdir "${installDataPath}/tarballcache"
-}
-
-pkg_postinst() {
-	#               1         2         3         4         5         6         7         8
-	#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	elog  "An example configuration file has already been created so you don't need to run"
-	elog  "make-config again; please copy and edit carefully on first setup:"
-	elog  "    cp -a ${installConfigPath}/production.ini.example ${installConfigPath}/production.ini"
-	elog  "    \$EDITOR ${installConfigPath}/production.ini"
-	elog  ""
-	elog  "After updates, please compare what has changed and copy any necessary changes:"
-	elog  "    diff -u ${installConfigPath}/production.ini ${installConfigPath}/production.ini.example"
-	elog  ""
-	elog  "You still need to follow Kallithea's other setup steps according to the"
-	elog  "instructions at:"
-	elog  "    ${urlDocumentationSetup}"
-	elog  ""
-	elog  "When doing so, please mind that Kallithea was installed into a Python virtual"
-	elog  "environment that has to be \"activated\" before it can be used. To do so,"
-	elog  "you will have to run a dedicated shell and initialize the environment by running"
-	elog  ""
-	elog  "    source ${installBasePath}/${virtualenvActivationPath}"
-	elog  ""
-	elog  "We altered the default config slightly. It may be best to have a look at our"
-	elog  "short example on how to setup hosting with Apache and mod_wsgi, even if you"
-	elog  "prefer another method of hosting Kallithea:"
-	elog  "    ${urlDocumentationMegacoffee}"
-	elog  ""
-	#elog  "We can wrap those commands for you if you run (no prior activation needed):"
-	#elog  "    emerge --config =${CATEGORY}/${PF}"
-	#elog  ""
-	elog  "Kallithea also provides a way to migrate your database if you are coming from"
-	elog  "RhodeCode 2.2 or below. Instructions can be found at:"
-	elog  "${urlDocumentationRhodeCode}"
-	elog  ""
-	ewarn "Bear in mind that the whole purpose of a Python virtual environment is to"
-	ewarn "isolate complex dependency installations from other instances installed on the"
-	ewarn "same system so you will have to remember to re-emerge this ebuild when"
-	ewarn "Kallithea's dependencies received bug and in particular security fixes (assuming"
-	ewarn "it allows any more recent versions to be installed)."
-	
-	if use sqlite ; then
-		ewarn ""
-		ewarn "You chose to use SQLite for Kallithea. Please be advised that this is *ONLY* for"
-		ewarn "testing purposes, please avoid using SQLite in production and choose a different"
-		ewarn "database instead."
-	fi
-}
-
-
-
-
-
-#################################################################################################
-### EVERYTHING BELOW WAS AN ATTEMPT TO ASSIST USERS ON SETUP BUT CALLING EDITORS NEVER WORKED ###
-### SHOULD STAY DEACTIVATED FOR NOW                                                           ###
-#################################################################################################
-
-
-my_read_line() {
-	# BASH function 'read' cannot write input back to variable in correct environment
-	# when run by emerge so we have to do *this* instead... great... :/
-	# (at least this works...)
-
-	python -c 'import sys; print(sys.stdin.readline().strip())'
-}
-
-config_menu() {
-	choice=""
-	
-	oldIFS="${IFS}"
-	IFS="
-	"
-	
-	#              1         2         3         4         5         6         7         8
-	#     12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	echo
-	echo "==============================================================================="
-	echo
-	echo "Your options:"
-	echo
-	echo "  1) create production config from template (paster make-config ...)"
-	echo "  2) edit production config"
-	echo "  3) initialize Kallithea (paster setup-db)"
-	echo "     This will also ask for repository location and create an admin account."
-	echo "  0) quit"
-	echo "     Kallithea should be able to run now, check documentation for more options"
-	echo "     such as setting up a task queue or full text search if you need it."
-	echo
-	
-	echo "TERM is ${TERM}"
-	
-	while [[ ! "${choice}" =~ ^[0-3]$ ]]; do
-		echo -n "Your choice? "
-		choice=$(my_read_line)
-	done
-	
-	IFS="${oldIFS}"
-	
-	return ${choice}
-}
-
-pkg_config() {
-	echo "Erm... You are not supposed to call --config as it has not been completed."
-	echo "Sorry, you will have to follow the docs yourself for now, see:"
-	echo "  ${urlDocumentationSetup}"
-	echo
-	echo
-	exit 1
-	
-	#              1         2         3         4         5         6         7         8
-	#     12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	
-	echo "Kallithea setup requires following multiple steps, some of which need to be run"
-	echo "in the correct virtual Python environment. This script helps you running those"
-	echo "commands by wrapping the commands to be run inside the correct virtualenv."
-	echo "You may still want to read the setup instructions while running this script:"
-	echo
-	echo "  ${urlDocumentationSetup}"
-	
-	# activate virtualenv
-	cd ${installBasePath} || die "installation is gone? (${installBasePath})"
-	source "${virtualenvActivationPath}" || die "failed to activate virtualenv (${installBasePath}/${virtualenvActivationPath})"
-	
-	configFileName='production.ini'
-	
-	while true; do
-		config_menu
-		choice=$?
-		echo
-		
-		case "${choice}" in
-			0) 	break
-				;;
-			
-			1)	mkdir -p "${installBasePath}/etc"
-				cd "${installBasePath}/etc"
-				
-				shouldCreate="y"
-				if [ -e "${configFileName}" ]; then
-					shouldCreate=""
-					while true; do
-						echo "${configFileName} already exists, overwrite?"
-					        while [[ ! "${shouldCreate}" =~ ^[yn]$ ]]; do
-					                echo -n "Enter y to overwrite, n to abort: "
-					                shouldCreate=$(my_read_line)
-					        done
-					done
-				fi
-
-				if [ "${shouldCreate}" == 'y' ]; then
-					echo 'Creating configuration file...'
-					paster make-config Kallithea ${configFileName}
-				else
-					echo 'Aborted, configuration file has not been overwritten.'
-				fi
-				;;
-			
-			2)	iniPath="${installBasePath}/etc/${configFileName}"
-				
-				if [ ! -e "${iniPath}" ]; then
-					echo "config not found at ${iniPath}; did you follow step 1?"
-					continue
-				fi
-				
-				# terminal and shell need a reset or editor will be screwed up
-				source /etc/profile
-				reset
-				stty sane
-				
-				# open editor
-				if [[ "${EDITOR}" != "" ]] && [ -e "${EDITOR}" ]; then
-					TERM="xterm" ${EDITOR} "${iniPath}"
-				else
-					TERM="xterm" nano -w "${iniPath}"
-				fi
-
-				# we better reset again...
-				source /etc/profile
-				reset
-				stty sane
-				;;
-			
-			*)	echo "invalid choice ${choice}"
-				;;
-		esac
-	done
-}
--- a/media-libs/blackmagic-desktop-video/Manifest	Thu Jun 16 21:45:15 2016 +0200
+++ b/media-libs/blackmagic-desktop-video/Manifest	Thu Jun 16 21:45:39 2016 +0200
@@ -1,5 +1,8 @@
 AUX 9-8-strict-prototypes.patch 600 SHA256 bdd692ad335f6b66f88149e52d59ee59e8401e0eb36234a3d175cccc04ccad91 SHA512 1c6ac8c6e8d97e1c428f720695831101568a51ebb47aaa346eef5fadca15bd9bc36ab1884156c1de5474f70b153097b04e7939c710c13338a7a9ed69086441ea WHIRLPOOL 34204ad2e7e3c18ee129876bbd93f0c22e94344694672ccb465ec8dfeae380ecc2f35a9e68fd33fef4745fde85cd3a2381ee7787361fbe1da155a2ac5ee97031
 DIST Blackmagic_Desktop_Video_Linux_10.6.6.tar 592264137 SHA256 444785bbeb5234bff4346deede1e19fa9a9fb20602a2637f38fbad2063bb8aab SHA512 4168f53fae755468f0808861bb8863c16a8197c7ca0f891e30a1f46c6051f17a4bc702e28bd74ade1bec3683bdfc46afa980d359fb21a6a800110aa0825ac107 WHIRLPOOL 278cd1a122ea5c7d9f1affd58ad08dbddc863d5e2732d6b85610ae6a8ea176020a34cc59b7a0e42277f227c71b4e6a17a73de21977813b331617f056830b3146
+DIST Blackmagic_Desktop_Video_Linux_10.6.8.tar 593097230 SHA256 ec0784ccd5bb0006babb9339542cf9c0a1c9f45449d8a4849b9227e617877a4e SHA512 b02e96b41187a390c91690f6ff08b2020cf04fa0023a9f48228797d1e703218c108f200020cabf60bb6dab8d0b2da07be25e3907e1015878a32a5c832af8abc2 WHIRLPOOL 8222f30c7b66d605fa8e6de5bbb9be6c5bff30efdc7826b170a2550c8f1111b59a71fe7968643e222ca76166f2c93234cde0d6317031e006bba60567ad05ce7a
 DIST Blackmagic_Desktop_Video_Linux_9.8.tar.gz 141900528 SHA256 6977360490c806f9952028d50bc10782d5878e5d42bd7c0f5eb070b3b6e1116c SHA512 af4ccd5f9732633c4b3756766cd54c3329bf9edeb640462bb316e9c2b782550399806973a51e51c52fa47eaa018a11889b343cc3c1531282cc6524c6f630fce1 WHIRLPOOL 6497d43c147db98e433edb3639a666b1f39036c44fe317f835407458924969ca0ae1741c577bb7b92853cc720eb0fd6cda09aca820c8222adcbfe66bd9540fb9
-EBUILD blackmagic-desktop-video-10.6.6.ebuild 6640 SHA256 85f1b5980d9003b1a13806e1cf0ef449f88a63c05aaa889bef0d0014845ddfb7 SHA512 7bf98ea8f37502c63ef72acebdd246881912be9ae8ff790de6a89b7eee0293439cb0eb3eb404ccf0c2eb612ee3f027c559ededcf9bf6f6ce91f8e8b0ad7e0852 WHIRLPOOL b95d97f8e80579de6357178e7db96f9f32f4d96ec5d76df45355ad78027d43c3a3f1c7a0d41909a8d13bb3a313d4132ffcf24de898178c4ef737c73771a5ffbe
+EBUILD blackmagic-desktop-video-10.6.6.ebuild 7226 SHA256 c65c0f84bc01331eb91d86a9e2d56bc359f19f0ca6f6baa3b4e9d996ab3bd741 SHA512 6e662c29da2e25ab6a943dcc787efa98d9b54b2cf16642d4b4c9290093eabdc65631996928d28ac1f84b37d3d25921b4aff18fc573979ea9bee4bd17ecc30bc3 WHIRLPOOL 71a5ae012fb9214a00f5f93f29a632fa3b50704726f0b3fe366bbcb719122ea6b097cd7e9b48a6a9007dabf11f5c751b0fe5a42fbaa75fe1d371372c2001ac24
+EBUILD blackmagic-desktop-video-10.6.8.ebuild 7288 SHA256 f2e8f292f034a33a076bd7352f8744d9f15cf292b456bb0da932a12d610cfa61 SHA512 ae7a6d84c80ec720966dfee2fb915c6abb7490c6a7a21fedd15d395d7c27f2c4794ca12cb34d31142e438f7799de87603a2f8b006f46883a9a95af20314eac9e WHIRLPOOL d2b32910a46970341af33633630b42956c9d6184567d635235ffe029ef0f7798c8c5a443771b171b33fc1b5e597993b899ce9878fa6ec20ed57008fbbcbf8122
 EBUILD blackmagic-desktop-video-9.8.ebuild 4164 SHA256 95301cff3c1901ef3ade16d0e043b5354c53f5795cf56950b0f5f07678a9054a SHA512 5028ba85c878f41baad35457aa75c3f785768ca3759519caafd9c90b73c181712b83ba5dd48d3ddf65583ef7e32b88db673ce4840af237ce9ae1f0e19189765c WHIRLPOOL 70d6a04f80dbfd2131e8d2845c4b909dbfb932c9aa88198b5ed97d947780584a7f0e0cd21370f0bbd038df0a72d99f7fe7a71f607394814bfd4e4475d4ad876f
+MISC blackmagic-desktop-video-10.6.6.ebuild.orig 6722 SHA256 d691d5ae0313ab2f5aa2ed61f29806317a258022dfa6d867c1fe99bb04f96cf2 SHA512 c9814e16eb243b294ae36504b0aac7322b3aa719edd3cb2e9d7859918442d5c909ac8f3d7f501196ef1465217776e7aa4a165d72f973b946efe0d6e8a9cd8756 WHIRLPOOL db3e3af9dc42c28b155175538aebcadb65f77c881f65212151d85305210bd6b5180d6417772151a1497ffdb2abe6d1e69c41a857ba4a1577565cebf477e4942b
--- a/media-libs/blackmagic-desktop-video/blackmagic-desktop-video-10.6.6.ebuild	Thu Jun 16 21:45:15 2016 +0200
+++ b/media-libs/blackmagic-desktop-video/blackmagic-desktop-video-10.6.6.ebuild	Thu Jun 16 21:45:39 2016 +0200
@@ -21,8 +21,19 @@
 IUSE="autostart"
 RESTRICT="fetch"
 
+# dependencies found via command: (ldd would include transitive dependencies)
+# equery belongs $(for file in /usr/lib/libDeckLink* /usr/lib/blackmagic/*; do objdump -p $file | grep NEEDED; done 2>/dev/null | cut -b24- | sort | uniq | grep -vE 'lib(Qt5(Core|Network|Gui|Widgets)|qxcb|qgtk2|DeckLink)')
 DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+        dev-libs/glib:2
+        dev-libs/libxml2
+        media-libs/libpng:1.2
+        sys-devel/gcc
+        sys-libs/glibc
+        sys-libs/zlib
+        x11-libs/libX11
+        x11-libs/libXext
+       "
 
 # supress QA warnings about stripping etc., i.e. stuff we cannot change since we install prebuilt binaries
 QA_PREBUILT="opt/blackmagic-desktop-video/usr/bin/* opt/blackmagic-desktop-video/usr/lib/*"
@@ -147,6 +158,8 @@
 	einfo "Installed tools are BlackmagicFirmwareUpdater, BlackmagicFirmwareUpdaterGui and"
 	einfo "BlackmagicDesktopVideoUtility (former BlackmagicControlPanel)."
 	einfo ""
+	einfo "For Media Express emerge media-video/blackmagic-media-express."
+	einfo ""
 	if use autostart; then
 		einfo "Automated update check has been installed."
 	else
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-libs/blackmagic-desktop-video/blackmagic-desktop-video-10.6.8.ebuild	Thu Jun 16 21:45:39 2016 +0200
@@ -0,0 +1,192 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODOs:
+#  - fix QA notice about installing symlinks in /usr/lib
+
+EAPI=5
+
+inherit linux-mod
+
+DESCRIPTION="Desktop Video - drivers and tools for products by Blackmagic Design including DeckLink and Intensity"
+HOMEPAGE="http://www.blackmagicdesign.com/"
+HOMEPAGE_DOWNLOAD_NAME="Desktop Video ${PV}"
+
+SRC_URI="Blackmagic_Desktop_Video_Linux_${PV}.tar"
+DESKTOP_VIDEO_VERSION="10.6.8a2"
+UNPACKED_DIR="desktopvideo-${DESKTOP_VIDEO_VERSION}-x86_64"
+
+LICENSE="BlackmagicDesktopVideo"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="autostart"
+RESTRICT="fetch"
+
+# dependencies found via command: (ldd would include transitive dependencies)
+# equery belongs $(for file in /usr/lib/libDeckLink* /usr/lib/blackmagic/*; do objdump -p $file | grep NEEDED; done 2>/dev/null | cut -b24- | sort | uniq | grep -vE 'lib(Qt5(Core|Network|Gui|Widgets)|qxcb|qgtk2|DeckLink)')
+DEPEND=""
+RDEPEND="${DEPEND}
+	 dev-libs/glib:2
+	 dev-libs/libxml2
+	 media-libs/libpng:1.2
+	 sys-devel/gcc
+	 sys-libs/glibc
+	 sys-libs/zlib
+	 x11-libs/libX11
+	 x11-libs/libXext
+	"
+
+# supress QA warnings about stripping etc., i.e. stuff we cannot change since we install prebuilt binaries
+QA_PREBUILT="opt/blackmagic-desktop-video/usr/bin/* opt/blackmagic-desktop-video/usr/lib/*"
+
+# for kernel module compilation
+MODULE_NAMES="blackmagic(misc:${S}/usr/src/blackmagic-${DESKTOP_VIDEO_VERSION}:${S}/usr/src/blackmagic-${DESKTOP_VIDEO_VERSION}) blackmagic-io(misc:${S}/usr/src/blackmagic-io-${DESKTOP_VIDEO_VERSION}:${S}/usr/src/blackmagic-io-${DESKTOP_VIDEO_VERSION})"
+BUILD_TARGETS="clean all"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE} and download \"${HOMEPAGE_DOWNLOAD_NAME}\""
+	einfo "for your product from the support section and move it to ${DISTDIR}"
+	einfo ""
+	einfo "  expected filename: ${SRC_URI}"
+	einfo ""
+	einfo "If your browser downloads a .tar.gz file you will need to gunzip it."
+}
+
+pkg_pretend() {
+	if kernel_is -gt 3 18; then
+		#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
+		ewarn "Your kernel version seems to be unsupported; please consider downgrading to 3.18"
+		ewarn "if modules don't work."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${WORKDIR}
+	tar xfz Blackmagic_Desktop_Video_Linux_${PV}/other/x86_64/desktopvideo-${DESKTOP_VIDEO_VERSION}-x86_64.tar.gz
+	
+	# symlink to what is supposed to have been prepared
+	ln -s ${UNPACKED_DIR} ${P}
+}
+
+#src_prepare() {
+#	epatch "${FILESDIR}/9-8-strict-prototypes.patch"
+#}
+
+src_compile() {
+	# library/tools are binary but kernel module requires compilation
+	linux-mod_src_compile
+}
+
+src_install() {
+	# all pre-built binaries should go into /opt and be symlinked to usr/bin etc.
+	finalinstalldir="/opt/blackmagic-desktop-video"
+	installdir="${D}${finalinstalldir}"
+	
+	mkdir -p ${installdir}
+	cp -a ${WORKDIR}/${UNPACKED_DIR}/* ${installdir}/
+	
+	# copy text files (readme and license) from parent directory
+	cp -a ${WORKDIR}/Blackmagic_Desktop_Video_Linux_${PV}/*.txt ${installdir}/
+	
+	# there should a blank directory in /etc according to the archive...
+	mkdir -p ${installdir}/etc/blackmagic
+	chmod 755 ${installdir}/etc/blackmagic
+	
+	# NOTE: Not linking usr/lib/systemd as I don't use that and thus can't test it...
+	symlinks=(
+			'etc/init.d/DesktopVideoHelper'
+			'usr/bin/BlackmagicDesktopVideoUtility'
+			'usr/bin/BlackmagicFirmwareUpdater'
+			'usr/bin/BlackmagicFirmwareUpdaterGui'
+			'usr/lib/blackmagic'
+			'usr/lib/libDeckLinkAPI.so'
+			'usr/lib/libDeckLinkPreviewAPI.so'
+			'usr/sbin/DesktopVideoHelper'
+			'usr/share/applications/BlackmagicDesktopVideoUtility.desktop'
+			'usr/share/applications/BlackmagicFirmwareUpdaterGui.desktop'
+			'usr/share/doc/desktopvideo'
+			'usr/share/doc/desktopvideo-gui'
+			'usr/share/icons/hicolor/16x16/apps/BlackmagicDesktopVideoUtility.png'
+			'usr/share/icons/hicolor/16x16/apps/BlackmagicFirmwareUpdaterGui.png'
+			'usr/share/icons/hicolor/32x32/apps/BlackmagicDesktopVideoUtility.png'
+			'usr/share/icons/hicolor/32x32/apps/BlackmagicFirmwareUpdaterGui.png'
+			'usr/share/icons/hicolor/48x48/apps/BlackmagicDesktopVideoUtility.png'
+			'usr/share/icons/hicolor/48x48/apps/BlackmagicFirmwareUpdaterGui.png'
+			'usr/share/icons/hicolor/128x128/apps/BlackmagicDesktopVideoUtility.png'
+			'usr/share/icons/hicolor/128x128/apps/BlackmagicFirmwareUpdaterGui.png'
+			'usr/share/icons/hicolor/256x256/apps/BlackmagicDesktopVideoUtility.png'
+			'usr/share/icons/hicolor/256x256/apps/BlackmagicFirmwareUpdaterGui.png'
+                 )
+	
+	for path in "${symlinks[@]}"; do
+		dosym /opt/blackmagic-desktop-video/${path} ${path}
+	done
+	
+	# dneuge: no clue on how to use this...
+	## QA notice says we should generate a linker script if we don't place libraries in /usr/lib
+	## see: https://devmanual.gentoo.org/eclass-reference/toolchain-funcs.eclass/index.html
+	#gen_usr_ldscript usr/lib/libDeckLinkAPI.so usr/lib/libDeckLinkPreviewAPI.so
+
+	# don't symlink man-pages, install a copy instead
+	doman usr/share/man/man1/*.1
+	
+	# udev rule should be placed in /lib/udev/rules.d instead
+	dosym /opt/blackmagic-desktop-video/etc/udev/rules.d/55-blackmagic.rules /lib/udev/rules.d/55-blackmagic.rules
+	
+	# add firmware check to autostart?
+	if use autostart; then
+		dosym /opt/blackmagic-desktop-video/etc/xdg/autostart/BlackmagicFirmwareUpdaterGuiAutoStart.desktop /etc/xdg/autostart/BlackmagicFirmwareUpdaterGuiAutoStart.desktop
+	fi
+	
+	# kernel module
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	# kernel module
+	linux-mod_pkg_postinst
+	
+	#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
+	einfo ""
+	einfo "Please do *NOT* report any QA errors to Gentoo or Blackmagic!"
+	einfo ""
+	einfo "Kernel modules are blackmagic and blackmagic-io. Try blackmagic if in doubt."
+	einfo "When upgrading, please rmmod both first. Then modprobe blackmagic to see if it"
+	einfo "works (it should print your devices to kernel log)."
+	einfo ""
+	einfo "Installed tools are BlackmagicFirmwareUpdater, BlackmagicFirmwareUpdaterGui and"
+	einfo "BlackmagicDesktopVideoUtility (former BlackmagicControlPanel)."
+	einfo ""
+	einfo "For Media Express emerge media-video/blackmagic-media-express."
+	einfo ""
+	if use autostart; then
+		einfo "Automated update check has been installed."
+	else
+		einfo "Automated update check has *not* been installed this time. (set USE flag"
+		einfo "autostart if you want that)"
+	fi
+	einfo ""
+	einfo "If your product is not being recognized, there are two common reasons:"
+	einfo ""
+	einfo " 1) You may need to increase the vmalloc limit in your kernel."
+	einfo "    This can be done by adding e.g. vmalloc=256M to your kernel boot line. You"
+	einfo "    can see current usage by running"
+	einfo ""
+	einfo "    # grep VmallocUsed /proc/meminfo"
+	einfo ""
+	einfo " 2) Your firmware may be outdated. Make sure you reload the modules (or simply"
+	einfo "    reboot) and then run BlackmagicFirmwareUpdater or, if you prefer,"
+	einfo "    BlackmagicFirmwareUpdaterGui"
+	einfo ""
+	einfo "License can be found in: ${finalinstalldir}/License.txt"
+	einfo ""
+	einfo "We are reloading udev rules now..."
+	/bin/udevadm control --reload-rules || einfo " ... failed, you may want to check this before rebooting!"
+}
+
+pkg_postrm() {
+	# kernel module
+	linux-mod_pkg_postrm
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/blackmagic-media-express/Manifest	Thu Jun 16 21:45:39 2016 +0200
@@ -0,0 +1,2 @@
+DIST Blackmagic_Desktop_Video_Linux_10.6.8.tar 593097230 SHA256 ec0784ccd5bb0006babb9339542cf9c0a1c9f45449d8a4849b9227e617877a4e SHA512 b02e96b41187a390c91690f6ff08b2020cf04fa0023a9f48228797d1e703218c108f200020cabf60bb6dab8d0b2da07be25e3907e1015878a32a5c832af8abc2 WHIRLPOOL 8222f30c7b66d605fa8e6de5bbb9be6c5bff30efdc7826b170a2550c8f1111b59a71fe7968643e222ca76166f2c93234cde0d6317031e006bba60567ad05ce7a
+EBUILD blackmagic-media-express-3.5.2.ebuild 3637 SHA256 66aeae4b06d9682a592eb3552372e623b7a48e23836d09014da61f63566051b5 SHA512 2eabd28f6bb55a48bddd6adf1387b47a66ecca7379131fde20be246817ea1745c7f15a02be921f70c57dac6b968e072b4c4bdd6d446c32a89eea9f82a9f4262e WHIRLPOOL 662cd66b69823c6455bff661be838ee9559a7e806cab8618347b4c4b479ff4bca8c4c41547a7fbfaadfcc923e870d312da69b6ff9bce6516eaf49f86cca6eabb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media-video/blackmagic-media-express/blackmagic-media-express-3.5.2.ebuild	Thu Jun 16 21:45:39 2016 +0200
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODOs:
+#  - fix QA notice about installing symlinks in /usr/lib
+
+EAPI=5
+
+DESKTOP_VIDEO_SHORT_VERSION="10.6.8"
+MEDIA_EXPRESS_VERSION="3.5.2a2"
+
+DESCRIPTION="Media Express - Blackmagic Design's tool for media capture, organization and playback"
+HOMEPAGE="http://www.blackmagicdesign.com/"
+HOMEPAGE_DOWNLOAD_NAME="Desktop Video ${DESKTOP_VIDEO_SHORT_VERSION}"
+
+SRC_URI="Blackmagic_Desktop_Video_Linux_${DESKTOP_VIDEO_SHORT_VERSION}.tar"
+UNPACKED_DIR="mediaexpress-${MEDIA_EXPRESS_VERSION}-x86_64"
+
+LICENSE="BlackmagicDesktopVideo"
+SLOT="0"
+KEYWORDS="~amd64"
+#IUSE="autostart"
+RESTRICT="fetch"
+
+# dependencies for binaries found by commands: (ldd lists transitive dependencies as well which isn't what we want)
+# for file in /usr/lib/blackmagic/me/*; do objdump -p $file | grep NEEDED; done 2>/dev/null | cut -b24- | sort | uniq | grep -vE 'lib(Qt|MXF|DNxHDCodec)'
+# equery belongs $(for file in /usr/lib/blackmagic/me/*; do objdump -p $file | grep NEEDED; done 2>/dev/null | cut -b24- | sort | uniq | grep -vE 'lib(Qt|MXF|DNxHDCodec)')
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	 >=media-libs/blackmagic-desktop-video-10.6
+
+	 dev-libs/glib:2
+	 media-libs/alsa-lib
+	 media-libs/libpng:1.2
+	 sys-devel/gcc
+	 sys-libs/glibc
+	 sys-libs/zlib
+	 virtual/glu
+	 x11-libs/libX11
+	 x11-libs/libXext
+	"
+
+# supress QA warnings about stripping etc., i.e. stuff we cannot change since we install prebuilt binaries
+QA_PREBUILT="opt/blackmagic-media-express/usr/lib/*"
+
+pkg_nofetch() {
+	einfo "Media Express is bundled with Desktop Video downloads."
+	einfo ""
+	einfo "Please visit ${HOMEPAGE} and download \"${HOMEPAGE_DOWNLOAD_NAME}\""
+	einfo "for your product from the support section and move it to ${DISTDIR}"
+	einfo ""
+	einfo "  expected filename: ${SRC_URI}"
+	einfo ""
+	einfo "If your browser downloads a .tar.gz file you will need to gunzip it."
+}
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${WORKDIR}
+	tar xfz Blackmagic_Desktop_Video_Linux_${DESKTOP_VIDEO_SHORT_VERSION}/other/x86_64/mediaexpress-${MEDIA_EXPRESS_VERSION}-x86_64.tar.gz
+	
+	# symlink to what is supposed to have been prepared
+	ln -s ${UNPACKED_DIR} ${P}
+}
+
+src_install() {
+	# all pre-built binaries should go into /opt and be symlinked to usr/bin etc.
+	finalinstalldir="/opt/blackmagic-media-express"
+	installdir="${D}${finalinstalldir}"
+	
+	mkdir -p ${installdir}
+	cp -a ${WORKDIR}/${UNPACKED_DIR}/* ${installdir}/
+	
+	# NOTE: Not linking usr/lib/systemd as I don't use that and thus can't test it...
+	symlinks=(
+			'usr/bin/MediaExpress'
+			'usr/lib/blackmagic/me'
+			'usr/share/applications/MediaExpress.desktop'
+			'usr/share/doc/mediaexpress'
+			'usr/share/icons/hicolor/32x32/apps/MediaExpress.png'
+			'usr/share/icons/hicolor/48x48/apps/MediaExpress.png'
+			'usr/share/icons/hicolor/256x256/apps/MediaExpress.png'
+                 )
+	
+	for path in "${symlinks[@]}"; do
+		dosym ${finalinstalldir}/${path} ${path}
+	done
+	
+	# dneuge: no clue on how to use this...
+	## QA notice says we should generate a linker script if we don't place libraries in /usr/lib
+	## see: https://devmanual.gentoo.org/eclass-reference/toolchain-funcs.eclass/index.html
+	#gen_usr_ldscript usr/lib/libDeckLinkAPI.so usr/lib/libDeckLinkPreviewAPI.so
+
+	# don't symlink man-pages, install a copy instead
+	doman usr/share/man/man1/*.1
+}
+
+pkg_postinst() {
+	#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
+	einfo "Please do *NOT* report any QA errors to Gentoo or Blackmagic!"
+	einfo ""
+	einfo "License can be found in: ${finalinstalldir}/usr/share/doc/mediaexpress/License.txt"
+}
--- a/profiles/package.mask	Thu Jun 16 21:45:15 2016 +0200
+++ b/profiles/package.mask	Thu Jun 16 21:45:39 2016 +0200
@@ -3,12 +3,3 @@
 # ebuild was restored from official portage tree after deletion and should
 # only be used as a last resort
 =media-libs/xine-lib-1.1.20
-
-# Daniel Neugebauer <dneuge@energiequant.de> (5 May 2016)
-# for gentoo-overlay.megacoffee.net
-# Kallithea versions prior to 0.3.2 contain two security issues which were
-# fixed in 0.3.2; please upgrade as soon as possible. 0.3.1 ebuild will be
-# removed in June.
-# Vulnerabilities: CVE-2016-3114, CVE-2016-3691
-# For details see: https://kallithea-scm.org/news/release-0.3.2.html
-=dev-vcs/kallithea-0.3.1