Merge branch 'master' of git+ssh://anongit.gentoo.org/user/displacer

48 files changed, 2785 insertions, 291 deletions

diff --git a/app-laptop/zenbook-als-module/Manifest b/app-laptop/zenbook-als-module/Manifest
new file mode 100644
index 0000000..573c21f
--- /dev/null
+++ b/app-laptop/zenbook-als-module/Manifest
@@ -0,0 +1,4 @@
+DIST zenbook-als-module-0_p20140423-git.tar.gz 2591 SHA256 6a9959d1e9d1b946c68d95f0483c3241cca5d1470af2d351e7528d33bad5ca73 SHA512 0d51973f47e76f772e71c97cfa8f5c63416a156c016d7c50485765cdfcca5ee593af88a2d6664c7f475d368e316329928227dfde8bed9258f38b17ff459c4ecb WHIRLPOOL e43518052ca1c3882c6204fd9eebfb7381371b910a13192de74ba5b9207efe5599cd1b0847f58d1ae19679bed220864b87ebb832735453bf1aefeb2caf1bc4fb
+EBUILD zenbook-als-module-0_p20140423.ebuild 755 SHA256 12e0b2833685662e218f65f8ef419fff1a95b92d9c32910d8942ec6fd4f33b36 SHA512 996e4754ca7c35e436c1eff5e5bc495d7b78bc0d488d8eea994d5370b737160328ce3cc73f2bf9419df2c95619ad1615abe9788f0dea071729deef2003b72334 WHIRLPOOL a932250318ba936107bfe4b03fbca4664f6da48e32abe24c8683872dcfc7efe1d238267b5e46361f1e212bb7f81d637a52ac699f014657be0c7533e16cfc8693
+EBUILD zenbook-als-module-9999.ebuild 755 SHA256 12e0b2833685662e218f65f8ef419fff1a95b92d9c32910d8942ec6fd4f33b36 SHA512 996e4754ca7c35e436c1eff5e5bc495d7b78bc0d488d8eea994d5370b737160328ce3cc73f2bf9419df2c95619ad1615abe9788f0dea071729deef2003b72334 WHIRLPOOL a932250318ba936107bfe4b03fbca4664f6da48e32abe24c8683872dcfc7efe1d238267b5e46361f1e212bb7f81d637a52ac699f014657be0c7533e16cfc8693
+MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
diff --git a/app-laptop/zenbook-als-module/metadata.xml b/app-laptop/zenbook-als-module/metadata.xml
new file mode 100644
index 0000000..bfcb697
--- /dev/null
+++ b/app-laptop/zenbook-als-module/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-laptop/zenbook-als-module/zenbook-als-module-0_p20140423.ebuild b/app-laptop/zenbook-als-module/zenbook-als-module-0_p20140423.ebuild
new file mode 100644
index 0000000..3de6d29
--- /dev/null
+++ b/app-laptop/zenbook-als-module/zenbook-als-module-0_p20140423.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit linux-mod
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/danieleds/als.git"
+	KEYWORDS=""
+else
+	COMMIT_ID="150684d1b73e1405609502e1166ba878c42dbb18"
+	SRC_URI="https://github.com/danieleds/als/archive/${COMMIT_ID}.tar.gz -> ${P}-git.tar.gz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/als-${COMMIT_ID}
+fi
+
+DESCRIPTION="A kernel module for the ASUS Zenbook Ambient Light Sensor Driver"
+HOMEPAGE="http://github.com/danieleds/als"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+MODULE_NAMES="als(misc:${S})"
+BUILD_TARGETS="all"
+
+src_compile(){
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	linux-mod_src_compile
+}
diff --git a/app-laptop/zenbook-als-module/zenbook-als-module-9999.ebuild b/app-laptop/zenbook-als-module/zenbook-als-module-9999.ebuild
new file mode 100644
index 0000000..3de6d29
--- /dev/null
+++ b/app-laptop/zenbook-als-module/zenbook-als-module-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit linux-mod
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/danieleds/als.git"
+	KEYWORDS=""
+else
+	COMMIT_ID="150684d1b73e1405609502e1166ba878c42dbb18"
+	SRC_URI="https://github.com/danieleds/als/archive/${COMMIT_ID}.tar.gz -> ${P}-git.tar.gz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/als-${COMMIT_ID}
+fi
+
+DESCRIPTION="A kernel module for the ASUS Zenbook Ambient Light Sensor Driver"
+HOMEPAGE="http://github.com/danieleds/als"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+MODULE_NAMES="als(misc:${S})"
+BUILD_TARGETS="all"
+
+src_compile(){
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	linux-mod_src_compile
+}
diff --git a/app-laptop/zenbook-als/Manifest b/app-laptop/zenbook-als/Manifest
new file mode 100644
index 0000000..99fcb78
--- /dev/null
+++ b/app-laptop/zenbook-als/Manifest
@@ -0,0 +1,5 @@
+AUX zenbook-als.initd 1025 SHA256 e5f882fccd205fafd80ec1e5cd766b7a286f69e7be14f6b3e88215df243bb34e SHA512 2af1e1bbc52e6149b4516300df15dfb5e9e22c1810572447697c765c38b279a4a8ddd512b671346deba73a73980ae6e5435606d7e80edb52e840a767cb164149 WHIRLPOOL 27cadbe2493cc43990a512ff80b1bf74d0d553bc4fa4441be74563fae4e2117282be7b4faed10cd1423cfc564cccabb5e49d822b58a4eb93173d525c2675da45
+DIST zenbook-als-0_p20140502-git.tar.gz 17782 SHA256 f7efa74444061a8431fd0218180d45d568a3e1be09509254cd229daa4542471d SHA512 5bac08041f32697288861ab8126f97c27d7a0f274a4737c5e7e76e19e729928949128c52525b54845c22e9ffded93a73d17805ed753971615019a5844a748099 WHIRLPOOL 89634142ab2624ff6f1419dc3595c5af6cffbd2f9692940f753122f7c9363a08671c4ff6a711bc0b78368359409106e6e1f8dbf1798b6f33a7d2361067884ea4
+EBUILD zenbook-als-0_p20140502.ebuild 977 SHA256 a93fa697c4a566fb5c5ef8842c9510ce418533ec5e66da2c8a0f0ce561910d32 SHA512 13fea848a25f248e7a66acaefc0646272965f1b6a437ace435ce6171ff40c1c1267b0029b58e9d3de6115569d6659d801e79d98778c6b37289fa403b2251d10f WHIRLPOOL d9a22d4340169223352ade553a7172d5816fd1158f47feca584f2ffea1b26d3ac53e02848600a2909c419b7e75b180f9ea5ae1d9c2dafe47a50fc94b85b0169c
+EBUILD zenbook-als-9999.ebuild 977 SHA256 85ebb0a98487659839482d9ffcfe01cd873e616a76caae3b1803978a35895156 SHA512 cee798f8752764716438d9951e699df298d6efb22e6fe3524b2bdf38b8c810ac2e0d2eb5ff256b864392083123e261ed2213f1d05b60cf008e97e70564944692 WHIRLPOOL 879999d142150e8041166ec17917a639bb726bb4ebbb82a4d92b16add04009484f986ad5d7b922d45e5a259438ac58106ad38eace578b36e1bbeac20492846eb
+MISC metadata.xml 231 SHA256 9c04e1ed256c8293b1120d9b56de16e3ee5ff6cdb3967d517d46c5974c23d67a SHA512 0aaf70d152f2b3a4b333fccde6f5c9fbb6cac1a9ecf3e2b2ddb57a1c260b3f0e7bdd215edad17f959b2a3324929bf446164341531783431c3435d1b956d09d83 WHIRLPOOL d631165d8a2dd82731e34fed2e3c09437b8c0d383da28c3e0a5f704196afc1810a7efee388e6b558493e82fa61cc799ab3b93eb1b7b17464dd380efdcba60d06
diff --git a/app-laptop/zenbook-als/files/zenbook-als.initd b/app-laptop/zenbook-als/files/zenbook-als.initd
new file mode 100644
index 0000000..010efa0
--- /dev/null
+++ b/app-laptop/zenbook-als/files/zenbook-als.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript                                                                                                                                                        # Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+command="/usr/sbin/als-controller"
+description="Controller for Asus Zenbook ambient light sensor"
+pidfile="/var/run/als-controller.pid"
+
+checkconfig() {
+	if [ ! -L "/sys/bus/acpi/devices/ACPI0008:00" ]; then  
+		eerror "Missing device ACPI0008:00."
+		eerror "Probably your grub bootline has wrong acpi_osi setting."
+		return 1
+	fi
+	return 0
+}
+
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting Asus Zenbook ambient light sensor controller"
+	start-stop-daemon --start --exec "${command}" --pidfile "${pidfile}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Asus Zenbook ambient light sensor controller"
+	start-stop-daemon --stop --exec "${command}" --pidfile "${pidfile}"
+	eend $?
+
+}
+
+reload() {
+	stop
+	sleep 3
+	start
+}
diff --git a/app-laptop/zenbook-als/metadata.xml b/app-laptop/zenbook-als/metadata.xml
new file mode 100644
index 0000000..bfcb697
--- /dev/null
+++ b/app-laptop/zenbook-als/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-laptop/zenbook-als/zenbook-als-0_p20140502.ebuild b/app-laptop/zenbook-als/zenbook-als-0_p20140502.ebuild
new file mode 100644
index 0000000..5877c35
--- /dev/null
+++ b/app-laptop/zenbook-als/zenbook-als-0_p20140502.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qmake-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/danieleds/Asus-Zenbook-Ambient-Light-Sensor-Controller.git"
+	KEYWORDS=""
+else
+	COMMIT_ID="ba447bc47271dbf69ac4a4bad11cfadc04df69c3"
+	SRC_URI="https://github.com/danieleds/Asus-Zenbook-Ambient-Light-Sensor-Controller/archive/${COMMIT_ID}.tar.gz -> ${P}-git.tar.gz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/Asus-Zenbook-Ambient-Light-Sensor-Controller-${COMMIT_ID}
+fi
+
+DESCRIPTION="ASUS Zenbook Ambient Light Sensor Controller"
+HOMEPAGE="http://github.com/victorenator/als"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/libbsd"
+RDEPEND="${DEPEND}
+	app-laptop/zenbook-als-module"
+
+src_configure() {
+	eqmake4 service/als-controller.pro
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd als-controller
+	dodoc README.md
+	dosbin als-controller
+}
diff --git a/app-laptop/zenbook-als/zenbook-als-9999.ebuild b/app-laptop/zenbook-als/zenbook-als-9999.ebuild
new file mode 100644
index 0000000..4f26d1f
--- /dev/null
+++ b/app-laptop/zenbook-als/zenbook-als-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qmake-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/Displacer/Asus-Zenbook-Ambient-Light-Sensor-Controller.git"
+	KEYWORDS=""
+else
+	COMMIT_ID="ba447bc47271dbf69ac4a4bad11cfadc04df69c3"
+	SRC_URI="https://github.com/danieleds/Asus-Zenbook-Ambient-Light-Sensor-Controller/archive/${COMMIT_ID}.tar.gz -> ${P}-git.tar.gz"
+	KEYWORDS="~amd64"
+	S=${WORKDIR}/Asus-Zenbook-Ambient-Light-Sensor-Controller-${COMMIT_ID}
+fi
+
+DESCRIPTION="ASUS Zenbook Ambient Light Sensor Controller"
+HOMEPAGE="http://github.com/victorenator/als"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/libbsd"
+RDEPEND="${DEPEND}
+	app-laptop/zenbook-als-module"
+
+src_configure() {
+	eqmake4 service/als-controller.pro
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd als-controller
+	dodoc README.md
+	dosbin als-controller
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
new file mode 100644
index 0000000..973c63a
--- /dev/null
+++ b/dev-libs/libsodium/Manifest
@@ -0,0 +1,2 @@
+EBUILD libsodium-9999.ebuild 971 SHA256 f1874d79bbc4f3f9835ec6efcceb94b6538e2db23e818aa1cc62aac829d0fa48 SHA512 e71d41073784da512e5b2c1aa12f1ba60632ee0ace4d71345f782c139cf974530649ea2040a27f633e72a0c3d8ffedab3e571d624fdb57611f2efb67a2a1b7e6 WHIRLPOOL d9a8416c17e95df338ac8ab32d2e3fcf9e8a85228b34ca0674ec57bb876b68f6238004b4bdc35441fb6dcc5dab0f93ff68f3d02fcefa5851ad758181d4315290
+MISC metadata.xml 768 SHA256 02d56236860e9adef166f0022789b848caa7da217a6ce4c02adca700b5bb3895 SHA512 2f5c78c7ba276485585935676c61afa2991962d1fbe8d23adee282170565f82bbfd1ffd439592aee03da8b06924ae14e46887e22f90e93390233fe5c6dec3aa8 WHIRLPOOL 5df9b9e7481d74267fff960fb662ac4e41386c61ee43b7ed653e7ceb226a2d981ddd49c1196e6f118a589cb37ef364ab61a637481e5bf035f2dc64ac9fd363e2
diff --git a/dev-libs/libsodium/libsodium-9999.ebuild b/dev-libs/libsodium/libsodium-9999.ebuild
new file mode 100644
index 0000000..f36fc6e
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit base eutils multilib-build git-2
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI=""
+
+EGIT_REPO_URI="https://github.com/jedisct1/libsodium"
+EGIT_BOOTSTRAP="./autogen.sh"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+IUSE="+asm +urandom"
+
+src_prepare() {
+	epatch_user
+	multilib_copy_sources
+}
+
+sodium_src_configure() {
+	cd "${BUILD_DIR}"
+
+	econf \
+			$(use_enable asm) \
+			$(use_enable !urandom blocking-random)
+}
+
+sodium_src_compile() {
+	cd "${BUILD_DIR}"
+	base_src_compile
+}
+
+sodium_src_install() {
+	cd "${BUILD_DIR}"
+	base_src_install
+}
+
+src_configure() {
+	multilib_parallel_foreach_abi sodium_src_configure
+}
+
+src_compile() {
+	multilib_foreach_abi sodium_src_compile
+}
+
+src_install() {
+	multilib_foreach_abi sodium_src_install
+	multilib_check_headers
+}
diff --git a/dev-libs/libsodium/metadata.xml b/dev-libs/libsodium/metadata.xml
new file mode 100644
index 0000000..5933491
--- /dev/null
+++ b/dev-libs/libsodium/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+
+	<longdescription>
+	NaCl (pronounced "salt") is a new easy-to-use high-speed software library for 
+	network communication, encryption, decryption, signatures, etc. NaCl's goal
+	is to provide all of the core operations needed to build higher-level
+	cryptographic tools. Sodium is a portable, cross-compilable, installable,
+	packageable fork of NaCl, with a compatible API.
+	</longdescription>
+	<use>
+		<flag name="asm">Enables assembly implementations</flag>
+		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/minIni/Manifest b/dev-libs/minIni/Manifest
new file mode 100644
index 0000000..c4d1759
--- /dev/null
+++ b/dev-libs/minIni/Manifest
@@ -0,0 +1 @@
+EBUILD minIni-9999.ebuild 410 SHA256 aa6ea72efde615a8c5c40f6796017ba7a1cd187ad6ae7801ab07bca6074a0309 SHA512 d00596999c875489773c1c96bf402d0dc75b0058ec3462bf8b9f7ffd81055aaa1d753dfe344e06711b47beee08944bf144d3826374251b4dff7ce7412b271ebf WHIRLPOOL 9f9c2d32f2f93b027e0495fe7a4ba89b63377c6dca9fc79781b64764fee1a9dbbac6afbb325b16c29d41f63e63800220d76cfeaeeb22d63f34b880474b8035b2
diff --git a/dev-libs/minIni/minIni-9999.ebuild b/dev-libs/minIni/minIni-9999.ebuild
new file mode 100644
index 0000000..cb4b5d3
--- /dev/null
+++ b/dev-libs/minIni/minIni-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="library for reading and writing ini files"
+HOMEPAGE="http://github.com/AuthenticEshkinKot/minIni"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND=""
+DEPEND=""
+
+EGIT_REPO_URI="git://github.com/AuthenticEshkinKot/minIni.git"
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
deleted file mode 100644
index d5a3179..0000000
--- a/media-gfx/digikam/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX digikam-2.5.0-d18ea6da.patch 3893 RMD160 d449166a3570478dd6080cb19d27ed1d84af9194 SHA1 9aec4b5276ff1ea2e63619e8dc4a9c0ef15e8708 SHA256 98b80114426c9394ff525b241d95e0d2381dfffce64f181af7afb84dbbd10dfd
-AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651
-DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
-EBUILD digikam-2.5.0-r1.ebuild 3856 RMD160 296bc3807fe3be8be5db3f384f137e95f803ba33 SHA1 43d5a6e88dce361ef872d77540ab4c56d680d436 SHA256 6be6d1efe5c523965a890c59035444c9e78c19b178732d67bfbab874f7f9d01b
diff --git a/media-gfx/digikam/digikam-2.5.0-r1.ebuild b/media-gfx/digikam/digikam-2.5.0-r1.ebuild
deleted file mode 100644
index c9e41b0..0000000
--- a/media-gfx/digikam/digikam-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.5.0.ebuild,v 1.1 2012/01/03 16:30:11 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu"
-
-KDE_HANDBOOK="optional"
-CMAKE_MIN_VERSION="2.8"
-KDE_MINIMAL="4.7"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-	handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep libkdcraw)
-	$(add_kdebase_dep libkexiv2)
-	$(add_kdebase_dep libkipi)
-	$(add_kdebase_dep marble plasma)
-	$(add_kdebase_dep solid)
-	media-libs/jasper
-	media-libs/lcms:0
-	>=media-libs/lensfun-0.2.5
-	>=media-libs/libkface-${PV}
-	>=media-libs/libkgeomap-${PV}
-	media-libs/liblqr
-	>=media-libs/libpgf-6.11.28
-	media-libs/libpng
-	media-libs/tiff
-	virtual/jpeg
-	x11-libs/qt-gui[qt3support]
-	>=sci-libs/clapack-3.2.1-r6
-	|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
-	addressbook? ( $(add_kdebase_dep kdepimlibs) )
-	gphoto2? ( media-libs/libgphoto2 )
-	mysql? ( virtual/mysql )
-"
-RDEPEND="${CDEPEND}
-	$(add_kdebase_dep kreadconfig)
-	media-plugins/kipi-plugins
-	video? (
-		|| (
-			$(add_kdebase_dep mplayerthumbs)
-			$(add_kdebase_dep ffmpegthumbs)
-		)
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${P}-libkipi.patch" 
-	"${FILESDIR}"/digikam-2.5.0-d18ea6da.patch )
-
-src_prepare() {
-	# just to make absolutely sure
-	rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-	# prepare the handbook
-	mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
-	echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
-	echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
-	# prepare the translations
-	mv "${WORKDIR}/${MY_P}/po" po || die
-	find po -name "*.po" -and -not -name "digikam.po" -exec rm {} +
-
-	echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die
-	echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-	echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-	kde4-base_src_prepare
-
-	if use handbook; then
-		echo "add_subdirectory( doc )" >> CMakeLists.txt
-	fi
-}
-
-src_configure() {
-	local backend
-
-	use semantic-desktop && backend="Nepomuk" || backend="None"
-	# LQR = only allows to choose between bundled/external
-	local mycmakeargs=(
-		-DFORCED_UNBUNDLE=ON
-		-DWITH_LQR=ON
-		-DWITH_LENSFUN=ON
-		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
-		$(cmake-utils_use_with addressbook KdepimLibs)
-		-DWITH_MarbleWidget=ON
-		$(cmake-utils_use_enable gphoto2 GPHOTO2)
-		$(cmake-utils_use_with gphoto2)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_enable themedesigner)
-		$(cmake-utils_use_enable thumbnails THUMBS_DB)
-		$(cmake-utils_use_enable mysql INTERNALMYSQL)
-		$(cmake-utils_use_enable debug DEBUG_MESSAGES)
-	)
-
-	kde4-base_src_configure
-}
-
-src_compile() {
-	local mytargets="all"
-	use doc && mytargets+=" doc"
-
-	kde4-base_src_compile ${mytargets}
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		# install the api documentation
-		insinto /usr/share/doc/${PF}/html
-		doins -r ${CMAKE_BUILD_DIR}/api/html/*
-	fi
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use doc; then
-		elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
-	fi
-}
diff --git a/media-gfx/digikam/files/digikam-2.5.0-d18ea6da.patch b/media-gfx/digikam/files/digikam-2.5.0-d18ea6da.patch
deleted file mode 100644
index e234bf1..0000000
--- a/media-gfx/digikam/files/digikam-2.5.0-d18ea6da.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur digikam-2.5.0.orig/core/libs/database/imagehistory/imagehistorygraph_boost.h digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
---- core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-03 08:32:26.000000000 +0800
-+++ core/libs/database/imagehistory/imagehistorygraph_boost.h	2012-01-29 01:02:31.635993670 +0800
-@@ -1198,7 +1198,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Store distance and predecessors in QMaps, wrapped to serve as property maps
-                                           distance_map(VertexIntMapAdaptor(distances)).
-                                           predecessor_map(VertexVertexMapAdaptor(predecessors))
-@@ -1218,7 +1218,7 @@
-             {
-                 boost::dag_shortest_paths(graph, v,
-                                           // we provide a constant weight of 1
--                                          weight_map(boost::ref_property_map<edge_t,int>(weight)).
-+                                          weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
-                                           // Invert the default compare method: With greater, we get the longest path
-                                           distance_compare(std::greater<int>()).
-                                           // will be returned if a node is unreachable
-@@ -1384,14 +1384,15 @@
-         template <class GraphType, typename VertexLessThan>
-         class lessThanMapEdgeToTarget
-         {
-+                typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
-         public:
-             lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
-                 : g(g), vertexLessThan(vertexLessThan) {}
-             const GraphType& g;
-             VertexLessThan vertexLessThan;
--            bool operator()(const Edge& a, const Edge& b)
-+            bool operator()(const edge_descriptor& a, const edge_descriptor& b)
-             {
--                return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
-+                return vertexLessThan(boost::target(a, g), boost::target(b, g));
-             }
-         };
- 
-@@ -1402,20 +1403,21 @@
-         {
-             typedef std::pair<Vertex, QList<Edge> > VertexInfo;
- 
--            QList<Edge>             outEdges;
-+            typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
-+            QList<edge_descriptor> outEdges;
-             std::vector<VertexInfo> stack;
- 
-             boost::put(color, u, boost::gray_color);
-             vis.discover_vertex(u, g);
- 
--            outEdges = toEdgeList(boost::out_edges(u, g));
-+            outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
-             // Sort edges. The lessThan we have takes vertices, so we use a lessThan which
-             // maps the given edges to their targets, and calls our vertex lessThan.
-             qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- 
--            foreach(const Edge& e, outEdges)
-+            foreach(const edge_descriptor& e, outEdges)
-             {
--                Vertex v = boost::target(e.toEdge(), g);
-+                Vertex v = boost::target(e, g);
-                 vis.examine_edge(e, g);
-                 boost::default_color_type v_color = boost::get(color, v);
-                 if (v_color == boost::white_color)
diff --git a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch b/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
deleted file mode 100644
index fbbac97..0000000
--- a/media-gfx/digikam/files/digikam-2.5.0-libkipi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 25cc9c9876a5233bd630105d0110319892d4e18c Mon Sep 17 00:00:00 2001
-From: Gilles Caulier <caulier.gilles@gmail.com>
-Date: Tue, 3 Jan 2012 15:16:37 +0100
-Subject: [PATCH] enable checkall and clearall buttons only with libkipi version 1.4.0
- BUGS: 290496
-
----
- utilities/setup/setupplugins.cpp |   13 +++++++++++--
- utilities/setup/setupplugins.h   |    4 ++--
- 2 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
-index 0f4030a..b8efb35 100644
---- a/utilities/setup/setupplugins.cpp
-+++ b/utilities/setup/setupplugins.cpp
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
-@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent)
- 
-     panel->setLayout(mainLayout);
- 
-+#if KIPI_VERSION < 0x010400
-+    d->checkAllBtn->setVisible(false);
-+    d->clearBtn->setVisible(false);
-+#endif
-+
-     initPlugins();
- 
-     // --------------------------------------------------------
-@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
- void SetupPlugins::slotCheckAll()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotCheckAll();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
- void SetupPlugins::slotClear()
- {
-     QApplication::setOverrideCursor(Qt::WaitCursor);
-+#if KIPI_VERSION >= 0x010400
-     d->kipiConfig->slotClear();
-+#endif
-     QApplication::restoreOverrideCursor();
- }
- 
-diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
-index 271a569..114e0fa 100644
---- a/utilities/setup/setupplugins.h
-+++ b/utilities/setup/setupplugins.h
-@@ -6,8 +6,8 @@
-  * Date        : 2004-01-02
-  * Description : setup Kipi plugins tab.
-  *
-- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
-+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
-  *
-  * This program is free software; you can redistribute it
-  * and/or modify it under the terms of the GNU General
--- 
-1.7.3.4
-
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
new file mode 100644
index 0000000..adeb24d
--- /dev/null
+++ b/media-gfx/freewrl/ChangeLog
@@ -0,0 +1,238 @@
+# ChangeLog for media-gfx/freewrl
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.53 2013/12/23 16:20:49 axs Exp $
+
+*freewrl-1.22.13-r3 (23 Dec 2013)
+
+  23 Dec 2013; Ian Stakenvicius <axs@gentoo.org>
+  +files/freewrl-1.22.13-desktop.patch, +freewrl-1.22.13-r3.ebuild,
+  -freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
+  fixed freewrl.desktop as per bug 495108
+
+  09 Aug 2013; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
+  freewrl-1.22.13-r2.ebuild, freewrl-9999.ebuild:
+  Adjusted deps for dev-lang/spidermonkey to ensure SLOT=0
+
+*freewrl-9999 (29 May 2013)
+
+  29 May 2013; Ian Stakenvicius <axs@gentoo.org> +freewrl-9999.ebuild:
+  added live ebuild. NOTE, upstream does NOT keep HEAD in a buildable state,
+  ymmv
+
+*freewrl-1.22.13-r2 (04 Nov 2012)
+
+  04 Nov 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13-r1.ebuild,
+  +freewrl-1.22.13-r2.ebuild:
+  reduce elog spam, add EAPI=5 ebuild with slot-operator dep on spidermonkey
+
+  24 Oct 2012; Ulrich Müller <ulm@gentoo.org> freewrl-1.22.13-r1.ebuild:
+  Update dependency after package move from x11-libs/openmotif to
+  x11-libs/motif.
+
+*freewrl-1.22.13-r1 (05 Sep 2012)
+
+  05 Sep 2012; Ian Stakenvicius <axs@gentoo.org> -freewrl-1.22.13.ebuild,
+  +freewrl-1.22.13-r1.ebuild:
+  revbump since the last patch was for a runtime issue instead of build-time
+  (thanks Ian)
+
+  29 Aug 2012; Ian Stakenvicius <axs@gentoo.org>
+  files/freewrl-1.22.13-fontconfig-match.patch:
+  fixed bad patch in last commit
+
+  29 Aug 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild,
+  +files/freewrl-1.22.13-fontconfig-match.patch:
+  fixed upstream bug id 3553666 re compatibility with fontconfig-2.90, thanks
+  to Ian Abbott for reporting
+
+  28 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild,
+  +files/freewrl-1.22.13-mozjs187-config.patch:
+  patched in support for spidermonkey-1.8.7
+
+  13 Jun 2012; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.13.ebuild:
+  updated ebuild to use new upstream tarball, fixes minor build system issue
+  with plugin
+
+  08 Jun 2012; Zac Medico <zmedico@gentoo.org> freewrl-1.22.13.ebuild:
+  inherit multilib for get_libdir
+
+*freewrl-1.22.13 (06 Jun 2012)
+
+  06 Jun 2012; Ian Stakenvicius <axs@gentoo.org> -freewrl-1.22.12_pre2.ebuild,
+  +freewrl-1.22.13.ebuild:
+  New release + remove old
+
+  05 May 2012; Jeff Horelick <jdhore@gentoo.org> freewrl-1.22.12_pre2.ebuild:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  01 Dec 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild:
+  fixed expat lib path error, bug 376863 (reopened)
+
+  22 Nov 2011; Ian Stakenvicius <axs@gentoo.org> freewrl-1.22.12_pre2.ebuild,
+  metadata.xml:
+  fixed dependencies to rely directly on spidermonkey instead of optionally on
+  xulrunner, and to rely on npapi-sdk instead of xulrunner or firefox
+
+  13 Oct 2011; Ian Stakenvicius <axs@gentoo.org> ChangeLog:
+  Taking over maintainership, thanks Patrick!
+
+  29 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.10-r1.ebuild:
+  Remove old
+
+  28 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.9.ebuild,
+  -freewrl-1.22.10.ebuild:
+  Remove old
+
+*freewrl-1.22.12_pre2 (28 Jul 2011)
+
+  28 Jul 2011; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.12_pre2.ebuild,
+  metadata.xml:
+  Bump, modified ebuild by Ian
+
+  22 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  freewrl-1.22.10-r1.ebuild:
+  Fix spidermonkey version for the new versioning scheme
+
+  21 May 2011; Samuli Suominen <ssuominen@gentoo.org>
+  freewrl-1.22.10-r1.ebuild:
+  Use -lmozjs instead of -ljs and force at least spidermonkey >= 1.9 wrt
+  #361663 by Ian Stakenvicius.
+
+*freewrl-1.22.10-r1 (02 Apr 2011)
+
+  02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> freewrl-1.22.10.ebuild,
+  +freewrl-1.22.10-r1.ebuild:
+  Rename USE="static" to USE="static-libs" wrt #361659. Force spidermonkey as
+  javascript engine until xulrunner-2 support is available wrt #361663.
+
+  01 Apr 2011; Patrick Lauer <patrick@gentoo.org> freewrl-1.22.9.ebuild,
+  freewrl-1.22.10.ebuild:
+  Fixing xulrunner dep for #361289
+
+  28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> freewrl-1.22.9.ebuild,
+  freewrl-1.22.10.ebuild:
+  Use virtual/jpeg.
+
+*freewrl-1.22.10 (02 Nov 2010)
+
+  02 Nov 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.10.ebuild:
+  Bump for #343449
+
+  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> freewrl-1.22.9.ebuild:
+  Fix openmotif dependency.
+
+*freewrl-1.22.9 (26 Aug 2010)
+
+  26 Aug 2010; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.6-r1.ebuild,
+  -freewrl-1.22.8.ebuild, +freewrl-1.22.9.ebuild:
+  Bump
+
+  25 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  freewrl-1.22.6-r1.ebuild, freewrl-1.22.8.ebuild:
+  Fix references for pkgmove from www-client/mozilla-firefox ->
+  www-client/firefox
+
+*freewrl-1.22.8 (08 Jun 2010)
+
+  08 Jun 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.8.ebuild,
+  metadata.xml:
+  Bump, thanks to Ian for the patch
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  freewrl-1.22.6-r1.ebuild, +files/freewrl-1.22.6-libpng14.patch:
+  Fix building with libpng14.
+
+*freewrl-1.22.6-r1 (08 Feb 2010)
+
+  08 Feb 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.6-r1.ebuild,
+  +files/freewrl-1.22.6-xulrunner192-fixes.patch:
+  Fix for xulrunner-1.9.2 by Ian Stakenvicius, fixes #303183
+
+  01 Feb 2010; Markus Meier <maekke@gentoo.org> freewrl-1.22.5.ebuild:
+  x86 stable, bug #300602
+
+  14 Jan 2010; <hwoarang@gentoo.org> freewrl-1.22.5.ebuild:
+  Stable on amd64 wrt bug #300602
+
+*freewrl-1.22.6 (07 Jan 2010)
+
+  07 Jan 2010; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.6.ebuild:
+  Bump
+
+  05 Oct 2009; Patrick Lauer <patrick@gentoo.org> metadata.xml:
+  Taking over package from hanno with ian as proxy maintainer
+
+*freewrl-1.22.5 (05 Oct 2009)
+
+  05 Oct 2009; Patrick Lauer <patrick@gentoo.org> +freewrl-1.22.5.ebuild,
+  metadata.xml:
+  Bump to 1.22.5, fixes #192840. Thanks to Ian Stakenvicius for the updated
+  ebuild
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  freewrl-1.16.1.ebuild, freewrl-1.18.10.ebuild, freewrl-1.18.14.ebuild,
+  freewrl-1.19.1.ebuild:
+  Drop virtual/x11 references.
+
+*freewrl-1.19.1 (02 Apr 2007)
+
+  02 Apr 2007; Hanno Boeck <hanno@gentoo.org> +freewrl-1.19.1.ebuild:
+  Version bump.
+
+*freewrl-1.18.14 (13 Feb 2007)
+
+  13 Feb 2007; Hanno Boeck <hanno@gentoo.org> +freewrl-1.18.14.ebuild:
+  Version bump.
+
+*freewrl-1.18.10 (17 Jan 2007)
+
+  17 Jan 2007; Hanno Boeck <hanno@gentoo.org> +files/freewrl-makefile,
+  +freewrl-1.18.10.ebuild:
+  Version bump and don't install fonts any more, depend on ttf-bitstream-vera
+  instead and set a symlink.
+
+  27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/FreeWRL-1.06+gentoo_pd.diff, -freewrl-1.06.ebuild:
+  clean out old, non-modX ebuild
+
+  13 Feb 2006; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild,
+  freewrl-1.16.1.ebuild:
+  Virtuals for perl-core
+
+  18 Jan 2006; Hanno Boeck <hanno@gentoo.org> freewrl-1.16.1.ebuild:
+  Modular X dependencies.
+
+  14 Jan 2006; Hanno Boeck <hanno@gentoo.org> freewrl-1.16.1.ebuild:
+  Fails with parallel build, set MAKEOPTS to -j1.
+
+  30 Dec 2005; <mcumming@gentoo.org> freewrl-1.06.ebuild:
+  Migrating libnet to perl-core
+
+  20 Dec 2005; Hanno Boeck <hanno@gentoo.org> freewrl-1.06.ebuild:
+  Remove dep on saxon-bin (bug #109622).
+
+*freewrl-1.16.1 (20 Dec 2005)
+
+  20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/freewrl-1.16.1-disable-rpm.patch,
+  +files/freewrl-1.16.1-plugin-install.patch,
+  +files/freewrl-1.16.1-use-java-home.patch, +freewrl-1.16.1.ebuild:
+  Version bump, thanks to basic in bug #74706.
+
+  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> freewrl-1.06.ebuild:
+  Remove GNUish cp -a call. Bug #103487.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> freewrl-1.06.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
+
+  01 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> freewrl-1.06.ebuild:
+  dev-java/saxon -> dev-java/saxon-bin
+
+*freewrl-1.06 (27 Jun 2004)
+
+  27 Jun 2004; Hanno Boeck <hanno@gentoo.org>
+  +files/FreeWRL-1.06+gentoo_pd.diff, +freewrl-1.06.ebuild:
+  User submitted ebuild from Denis Pitzalis in bug #22358.
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
new file mode 100644
index 0000000..01fe5e7
--- /dev/null
+++ b/media-gfx/freewrl/Manifest
@@ -0,0 +1,6 @@
+AUX freewrl-1.22.13-desktop.patch 350 SHA256 09176fe7ef22d8d0a2381bfb70edbacc99967c03cdf8a7677f948a9ca1149efb SHA512 3e8a2e2275243ac55a0a62b105aeff1166a39798e34f94878b46e02fdacc038d386768e388529b550d755c737e574f988b2ffacbc64f224ed6e5d6d67de2b4e2 WHIRLPOOL b0b07aa8d0b7a4e181e2ae72f277c536bdb9f3e04670a021a3fd4222a6df06c81b8f72ab5fbfe4749a22865d7c65aa02d29cbe4e3821024387443fee62ab6764
+AUX freewrl-1.22.13-fontconfig-match.patch 666 SHA256 81ad402685aac3746a1d3fefe3ce77e46f0d7521e721d02f6ceb2fa60b9501c5 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5 WHIRLPOOL 991306f3174466a7505a85592db0b6196f0f55fe4d5b0cb70b72b20c101d7f637b4dac34c2fd9c6b5e627c7c88ccdfc8db4a2b91b863271699fd75d130b4c0b0
+AUX freewrl-1.22.13-mozjs187-config.patch 486 SHA256 340a489d70b1e0d450b779f35686f09c1a50ba62cd8de5bb34340dec8c5ad561 SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298 WHIRLPOOL f54fb2c381f9fcd0c284898d49c9fd10e0210ade9399a47f241c4657d0c0e6f00edcfb1c3624164ad884562a1eea905f4a59b64979d4110ba3404430eef10e67
+EBUILD freewrl-9999.ebuild 4587 SHA256 0ed3b773405477fadc892902f25f746b2a5ddefb02eb66e3fa746b530ef45566 SHA512 a20e6b9f5a86672892481add22402587853203ea17de4096570427bb47c6bda505ef1fcec045fba1a706593d2bf76d6a56bd6cd4279b08e9547c4e05732c1b67 WHIRLPOOL 0068810dd5cb2a42c879af4689a76b2ec8b9397a013eb9719f56bbeadd2d5fd1ac1ca84c99a8f94b4cbd2351f4239fcaca25f39da89780e2fadeef390a809b6d
+MISC ChangeLog 8329 SHA256 bc2064b96d0ce58050ac9368cae9c23b503155f9bf4d1efdc79f4486e8d70831 SHA512 e94abf921d19153f01b85758da547e7ce84d146ac12054f9d6c576f20305b45d96b094823aba43a44bba922db80c0350c71c33fe2a090d73791fcdd1cc212ef6 WHIRLPOOL 6222756ca7c32f6f917bf9e516a46bcc7b6ff1499cded1fd8de4f0bd8ef8a6ff4a00b458820f2ac069a64fc3632bdfaae285e3b5ac122d9d10cb4e6f6784175b
+MISC metadata.xml 547 SHA256 7d745ed3fa96fd3febcb5f3f9891b87c29a8c24ac7614840c6f7a378b20feb37 SHA512 0aaab59986ebcf9e64ef7ae5e1ff32e7e3a07de5e095245a1e2b1676c85f5e23f32a56da37f60dfb3cc6ba1c2f1837d792c2fc8ee9c5418f89c04d30345df877 WHIRLPOOL 8decb4e0059bb3075e79ad43e39640b1d28daebad84157f47320bb23f426dcba9ad062d262466b320e240c933999411c6e822b0a740eb93d2c363d2e304608b8
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
new file mode 100644
index 0000000..6d620b7
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-desktop.patch
@@ -0,0 +1,11 @@
+--- a/freewrl-1.22.13/data/freewrl.desktop	2009-06-08 06:26:21.000000000 -0400
++++ b/freewrl-1.22.13/data/freewrl.desktop	2013-12-23 10:45:54.916307951 -0500
+@@ -3,7 +3,7 @@
+ Name=FreeWRL
+ Comment=View X3D and VRML files
+ Exec=/usr/bin/freewrl
+-Icon=freewrl.png
++Icon=freewrl
+ Terminal=false
+ Type=Application
+ Categories=Graphics;3DGraphics;Viewer;
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
new file mode 100644
index 0000000..36b844e
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-fontconfig-match.patch
@@ -0,0 +1,19 @@
+--- src/lib/scenegraph/Component_Text.c	15 Aug 2012 13:31:45 -0000	1.56
++++ src/lib/scenegraph/Component_Text.c	29 Aug 2012 14:18:43 -0000	1.57
+@@ -370,6 +370,7 @@
+     FcPattern *FW_fp=NULL;
+     FcPattern *FW_fm=NULL;
+     FcChar8 *FW_file=NULL;
++    FcResult fcjunkresult;
+     #else
+ 
+     if (!p->font_directory) {
+@@ -487,7 +488,7 @@
+     #ifdef HAVE_FONTCONFIG
+     FcConfigSubstitute(0,FW_fp,FcMatchPattern);
+     FcDefaultSubstitute(FW_fp);
+-    if (!(FW_fm = FcFontMatch(0,FW_fp,0))) {
++    if (!(FW_fm = FcFontMatch(0,FW_fp,&fcjunkresult))) {
+ 	/* do whatever is done when no match found */
+ 	printf ("could not find font for id %x\n",num);
+     } else {
diff --git a/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
new file mode 100644
index 0000000..645a231
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.22.13-mozjs187-config.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac	2012-06-13 13:17:43.000000000 -0400
++++ b/configure.ac	2012-06-18 15:34:59.000000000 -0400
+@@ -192,6 +192,7 @@
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[spidermonkey],[>=],[1.7.0])
+         ;;
+      *)
++        AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs187])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozjs185])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[mozilla-js],[>=],[1.9])
+         AC_MY_CHECK_MODULE(JAVASCRIPT_ENGINE,[xulrunner-js],[>=],[1.8])
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
new file mode 100644
index 0000000..1f29e0b
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-9999.ebuild,v 1.3 2013/12/23 16:20:49 axs Exp $
+
+EAPI=5
+
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/Displacer/freewrl"
+else
+	SRC_URI="mirror://sourceforge/freewrl/${P}.1.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="VRML97 and X3D compliant browser, library, and web-browser plugin"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl debug +glew java libeai motif +nsplugin osc +sox static-libs"
+
+COMMONDEPEND="x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libX11
+	motif? ( x11-libs/motif )
+	!motif? ( x11-libs/libXaw )
+	media-libs/mesa
+	glew? ( media-libs/glew )
+	virtual/opengl
+	media-libs/libpng
+	virtual/jpeg
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	curl? ( net-misc/curl )
+	osc? ( media-libs/liblo )
+	dev-lang/spidermonkey:0="
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	nsplugin? ( net-misc/npapi-sdk )"
+RDEPEND="${COMMONDEPEND}
+	media-fonts/dejavu
+	|| ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] )
+	app-arch/unzip
+	java? ( >=virtual/jre-1.4 )
+	sox? ( media-sound/sox )"
+
+src_prepare() {
+	if [[ ${PV} != "9999" ]]; then
+	epatch "${FILESDIR}"/${P}-fontconfig-match.patch
+	epatch "${FILESDIR}"/${P}-mozjs187-config.patch
+	fi
+	epatch_user
+	S="${S}/freex3d/"
+}
+
+src_configure() {
+	eautoreconf
+	# list of js libs without .pc support, to disable ./configure auto-checking
+	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )
+	# list of .pc supported spidermonkeys, to disable ./configure auto-checking
+	local spidermonkeys_pc=( mozjs187 mozjs185 )
+
+	local myconf="--enable-fontconfig
+		--without-expat
+		--without-glu
+		--with-x
+		--with-imageconvert=/usr/bin/convert
+		--with-unzip=/usr/bin/unzip
+		--disable-mozjs-17.0
+		${spidermonkeys[@]/#/ --disable-}"
+
+	if has_version "<dev-lang/spidermonkey-1.8.5" ; then
+		# spidermonkey pre-1.8.5 has no pkg-config, so override ./configure
+		myconf+="${spidermonkeys_pc[@]/#/ --disable-}"
+		JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
+		if has_version ">=dev-lang/spidermonkey-1.8" ; then
+			# spidermonkey-1.8 changed the name of the lib
+			JAVASCRIPT_ENGINE_LIBS="-lmozjs"
+		else
+			JAVASCRIPT_ENGINE_LIBS="-ljs"
+		fi
+		if has_version dev-lang/spidermonkey[threadsafe] ; then
+			JAVASCRIPT_ENGINE_CFLAGS+=" -DJS_THREADSAFE $(pkg-config --cflags nspr)"
+			JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
+		fi
+		export JAVASCRIPT_ENGINE_CFLAGS
+		export JAVASCRIPT_ENGINE_LIBS
+	fi
+	if use nsplugin; then
+		myconf+=" --with-plugindir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+		myconf+=" --disable-mozilla-plugin --disable-xulrunner-plugin"
+	fi
+	econf	${myconf} \
+		$(use_enable curl libcurl) \
+		$(use_with glew) \
+		$(use_enable debug) $(use_enable debug thread_colorized) \
+		$(use_enable libeai) \
+		$(use_enable java) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable osc) \
+		$(use_enable static-libs static) \
+		$(use_enable sox sound) \
+		$(usex sox "--with-soundconv=/usr/bin/sox") \
+		$(usex motif "--with-target=motif" "--with-target=x11") \
+		$(usex motif "--with-statusbar=standard" "--with-statusbar=hud")
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		insinto /usr/share/${PN}/lib
+		doins src/java/java.policy
+		java-pkg_regjar src/java/vrml.jar
+		# install vrml.jar as a JRE extension
+		dodir /usr/java/packages/lib/ext
+		dosym /usr/share/${PN}/lib/vrml.jar /usr/java/packages/lib/ext/vrml.jar
+		if ! has_version "media-gfx/freewrl[java]" ; then
+		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
+		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
+		elog "java policy:"
+		elog "	cat /usr/share/${PN}/lib/java.policy >>~/.java.policy"
+		fi
+	fi
+
+	# remove unneeded .la files (as per Flameeyes' rant)
+	cd "${D}"
+	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+	elog "By default, FreeWRL expects to find the 'firefox' binary in your include"
+	elog "path.  If you do not have firefox installed or you wish to use a different"
+	elog "web browser to open links that are within VRML / X3D files, please be sure to"
+	elog "specify the command via your BROWSER environment variable."
+	fi
+}
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
new file mode 100644
index 0000000..2dd4b2b
--- /dev/null
+++ b/media-gfx/freewrl/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>axs@gentoo.org</email>
+	<name>Ian Stakenvicius</name>
+</maintainer>
+<use> 
+        <flag name='glew'>Enable glew extensions</flag>
+        <flag name='libeai'>Build EAI C library</flag>
+        <flag name='osc'>Allows for OSC-based control and communication between multiple freewrl instances</flag>
+        <flag name='java'>Build and install java EAI/SAI support library</flag>
+</use>
+</pkgmetadata>
diff --git a/media-libs/soil/Manifest b/media-libs/soil/Manifest
new file mode 100644
index 0000000..99791d9
--- /dev/null
+++ b/media-libs/soil/Manifest
@@ -0,0 +1,2 @@
+DIST soil.zip 474967 SHA256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 SHA512 a575a84aa65b7556320779d635561341f5cf156418d0462473e5d1eb082829be3bcb30600b4887af75aeddd3715de16bdb3ca1668ebaa93eea62bacf22b79548 WHIRLPOOL 9d872dfc13e20649838ef341c4e2fa1ecca3fbf689c1e044109ef5f1b5162f85243e8d3e460f9efddc0ed5449a4143b9d13b3b6da8ac95ff842bdf15bd5eae51
+EBUILD soil-20080707.ebuild 1175 SHA256 aeb21d77170b6477782ff543da156ed0905b716f37b59117c87268ac64423f9d SHA512 41191526c4e35cc1a15a76d69c85d78ceef7d35b1c42c4af846afb7015f9cda2775ceb6daad6452cbde4a4f63533a3d4331feeaf038d5506b45a119beb9a9ae1 WHIRLPOOL e458103ada2886858967adc03372d8cb3f9c12119214fc92d7adab4d1e9347a654776127e745c93169328a8ff0e52ac4fd5d4ef8323a502064ed8be049593f51
diff --git a/media-libs/soil/soil-20080707.ebuild b/media-libs/soil/soil-20080707.ebuild
new file mode 100644
index 0000000..40cf122
--- /dev/null
+++ b/media-libs/soil/soil-20080707.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+DESCRIPTION="SOIL is a tiny C library used primarily for uploading textures into OpenGL."
+HOMEPAGE="http://www.lonesock.net/soil.html"
+SRC_URI="http://www.lonesock.net/files/soil.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE=""
+
+DEPEND="app-arch/unzip sys-apps/sed virtual/opengl"
+RDEPEND="virtual/opengl"
+
+src_unpack() {
+	mkdir ${WORKDIR}/${PN}
+	unzip ${DISTDIR}/${A} -d ${WORKDIR}/${PN} || die "Unpack failed"
+}
+
+src_compile() {
+	cd ${WORKDIR}/${PN}/Simple\ OpenGL\ Image\ Library/projects/makefile
+	sed -e 's/\/usr\/local/${D}usr/' makefile > temp
+	mv temp makefile
+	mkdir obj
+	emake || die "make failed"
+}
+
+src_install() {
+	cd ${WORKDIR}/${PN}/Simple\ OpenGL\ Image\ Library/projects/makefile
+	mkdir ${D}usr
+	mkdir ${D}usr/lib
+	mkdir ${D}usr/include
+	emake install || die "einstall failed"
+}
+
+pkg_postinst() {
+	mkdir /usr/include/SOIL
+	ln -s /usr/include/SOIL.h /usr/include/SOIL/SOIL.h
+	einfo "/usr/include/SOIL.h header file was linked to"
+	einfo "/usr/include/SOIL/SOIL.h."
+}
+
+pkg_postrm() {
+	rm -rf /usr/include/SOIL
+}
diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..d43e61c
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 9184a72..a23510f 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,5 @@
 EBUILD kicad-99999999-r2.ebuild 5294 SHA256 6c07260b85b3e68ec75c405031e795452008c3e0a43550b0e3d7c81af73ae989 SHA512 2cc7ee577b096e199a278994fc1c5cb2e8466696eeb458220734bca7d88dc305d7dfa4e94fcb63ba738b8ed2f141a59338cb843100117e1c3775f4c9a6542ab6 WHIRLPOOL bfac4321441c52ec845684a0134016788e07c5a451fcd89a030f790592c14450d08c4f2f9a02e4b35b4ee3b8abf526617091344110f925b07141de266fb56ef5
+EBUILD kicad-99999999-r4601.ebuild 4131 SHA256 12365ec6508d50e2049dac4bcd036cc48d686b054eaf8b2dcb975dde341e3e9a SHA512 51a87a2df1abc72cc3472e53e7d4f777476dcc6823fc35c5333cc2b4f81d0ac7bf8edb3600d7ebad9112ba892086c465c69e14bdd8ed7f0023cdf20c00b7cd59 WHIRLPOOL 1fac36c7b748260f02781e2ba109550c9fdb252cbf28aa16f4a8b625b3ee62062ed97c1495d8ca59a02182ba48d5857f2bece5130196a76c389081966b6226a9
+EBUILD kicad-99999999-r4609.ebuild 4990 SHA256 ac14db0c683c097bd24478c350926eedb5578a50f4d4f75637ce75c43753520c SHA512 9b5048c89c7ce4f126ab232cb6f3320edb1b98e13ae727891dfddbe1cb410409b598b1e4e1f1d88e855bd642156e99fbe8b35ae0f52491009041ccfb062efaa8 WHIRLPOOL a02a38a408d79ed239b3e7611ae687d93b6f0f28dc65b057a12d6a0c9a24a8696175f1539477f78e6efa5c8115f008516eb1681e459882359c8bed782654afa8
+EBUILD kicad-999999999.ebuild 5023 SHA256 44567bfd492a6100586d3714253d26d4fefd24889beb6b2b801827720c2b3d74 SHA512 7e740d0eb17c999dd997c048eb049ea29e61645ab93190c7271b7c01844acd1aa029f95fd2830aaee38a6148fc71c22cd97bf441ad8504dbe9543d06627e5c59 WHIRLPOOL a6d329d69c54fc0aaf976a9b6edc6d11807964d500937c970e9fa3aad09ce12a91aeba118129a2fa5161ed9e4c3930a25422205f2585423e8adfa06eea89b4cd
 MISC metadata.xml 607 SHA256 f75533f9fb6b14fe0322c1b895819a2b743e1a43489672fec3ae17c6da075092 SHA512 006c62d2e5202ac6decb78815d63e7a9bee59e23a8a8d0bfdc158a88e80c559b39b4f679b45dd9863e30f778ce1dd67e1121c852cca2cb9c76804ac078d3719f WHIRLPOOL bf878c5c4c926863cc43928afb7fa9262e5cc3b102ea84961eaef4289831661d1ec37ae6525c37e9c54d58a8eba6ba6698a746fed52dd8f02128aca7c7500e81
diff --git a/sci-electronics/kicad/kicad-99999999-r4601.ebuild b/sci-electronics/kicad/kicad-99999999-r4601.ebuild
new file mode 100644
index 0000000..ff76481
--- /dev/null
+++ b/sci-electronics/kicad/kicad-99999999-r4601.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets fdo-mime gnome2-utils bzr python-r1 flag-o-matic
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+EBZR_REPO_URI="lp:kicad"
+EBZR_REVISION="${PR#r}"
+
+KEYWORDS=""
+
+IUSE="dev-doc debug doc examples minimal python nanometr gost sexpr github"
+
+CDEPEND="x11-libs/wxGTK:2.8[X,opengl,gnome]
+		media-libs/glew"
+DEPEND="${CDEPEND}
+	>=dev-util/cmake-2.6.0
+	>=dev-libs/boost-1.40[python?]
+	app-arch/xz-utils
+	dev-doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	sys-libs/zlib
+	sci-electronics/electronics-menu
+	!minimal? ( sci-electronics/kicad-library )"
+
+src_unpack() {
+	bzr_src_unpack
+
+	if use doc; then
+		EBZR_REPO_URI="lp:~kicad-developers/kicad/doc" \
+		EBZR_PROJECT="kicad-doc" \
+		P="${P}/kicad-doc" \
+		EBZR_CACHE_DIR="kicad-doc" \
+		bzr_fetch
+	fi
+}
+
+src_prepare() {
+	sed 's|bzr patch -p0|patch -p0 -i|g' -i CMakeModules/download_boost.cmake
+
+	sed -e 's/Categories=Electronics/Categories=Development;Electronics/' \
+		-i	resources/linux/mime/applications/kicad.desktop || die 'sed failed'
+
+	# Add important doc files
+	sed -i -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' CMakeLists.txt || die "sed failed"
+
+	# Fix desktop files
+	rm resources/linux/mime/applications/eeschema.desktop
+
+	# Handle optional minimal install
+	if use minimal ; then
+		sed -i -e '/add_subdirectory(template)/d' CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add documentation and fix necessary code if requested
+	if use doc ; then
+		sed -i -e "s/subdirs.Add( wxT( \"kicad\" ) );/subdirs.Add( wxT( \"${PF}\" ) );/" \
+			-e '/subdirs.Add( _T( "help" ) );/d' common/edaappl.cpp || die "sed failed"
+	else
+		sed -i -e '/add_subdirectory(kicad-doc)/d' CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples ; then
+		sed -i -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' CMakeLists.txt || die "sed failed"
+	else
+		sed -i -e '/add_subdirectory(demos)/d' CMakeLists.txt || die "sed failed"
+	fi
+	sed 's|^    ../scripting/wx_python_helpers.cpp$||' -i pcbnew/CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	bzr whoami "anonymous"
+	if use amd64;then
+		append-cxxflags -fPIC
+	fi
+	need-wxwidgets unicode
+
+	mycmakeargs="${mycmakeargs}
+		-DKICAD_DOCS=/usr/share/doc/${PF}
+		-DKICAD_HELP=/usr/share/doc/${PF}
+		-DKICAD_CYRILLIC=ON
+		-DwxUSE_UNICODE=ON
+		-DKICAD_TESTING_VERSION=ON
+		-DKICAD_MINIZIP=OFF
+		-DKICAD_AUIMANAGER=OFF
+		-DKICAD_AUITOOLBAR=OFF
+		$(cmake-utils_use gost KICAD_GOST)
+		$(cmake-utils_use nanometr USE_PCBNEW_NANOMETRES)
+		$(cmake-utils_use sexpr USE_PCBNEW_SEXPR_FILE_FORMAT)
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	use dev-doc && doxygen Doxyfile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use dev-doc ; then
+		insinto /usr/share/doc/${PF}
+		doins uncrustify.cfg
+		cd Documentation
+		doins -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/*
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge kicad without the 'minimal' USE flag."
+		elog
+	fi
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-99999999-r4609.ebuild b/sci-electronics/kicad/kicad-99999999-r4609.ebuild
new file mode 100644
index 0000000..918c5f9
--- /dev/null
+++ b/sci-electronics/kicad/kicad-99999999-r4609.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets fdo-mime gnome2-utils bzr python-r1 flag-o-matic
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+EBZR_REPO_URI="lp:kicad"
+EBZR_REVISION="${PR#r}"
+[[ "${EBZR_REVISION}" == "0" ]] && EBZR_REVISION=""
+
+KEYWORDS=""
+
+IUSE="dev-doc debug doc examples minimal python nanometr gost sexpr github"
+
+LANGS="bg ca cs de el_GR en es fi fr hu it ja ko nl pl pt ru sl sv zh_CN"
+
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+CDEPEND="x11-libs/wxGTK:2.8[X,opengl,gnome]
+		media-libs/glew"
+DEPEND="${CDEPEND}
+	>=dev-util/cmake-2.6.0
+	>=dev-libs/boost-1.40[python?]
+	app-arch/xz-utils
+	dev-doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	sys-libs/zlib
+	sci-electronics/electronics-menu
+	!minimal? ( !sci-electronics/kicad-library )"
+
+src_unpack() {
+	bzr_src_unpack
+
+	if use doc; then
+		EBZR_REPO_URI="lp:~kicad-developers/kicad/doc" \
+		EBZR_PROJECT="kicad-doc" \
+		EBZR_UNPACK_DIR="${EBZR_UNPACK_DIR}/kicad-doc" \
+		EBZR_CACHE_DIR="kicad-doc" \
+		bzr_fetch
+	fi
+
+	if ! use minimal; then
+		EBZR_REPO_URI="lp:~kicad-testing-committers/kicad/library" \
+		EBZR_PROJECT="kicad-library" \
+		EBZR_UNPACK_DIR="${EBZR_UNPACK_DIR}/kicad-library" \
+		EBZR_CACHE_DIR="kicad-library" \
+		bzr_fetch
+	fi
+}
+
+src_prepare() {
+	if use python;then
+		# dev-python/wxpython don't support python3
+		sed '/set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)/d' -i CMakeModules/FindPythonLibs.cmake || die "sed failed"
+	fi
+
+	if use doc;then
+		for lang in ${LANGS};do
+			for x in ${lang};do
+				if ! use linguas_${x}; then
+					sed "s| \<${x}\>||" -i kicad-doc/{internat,doc/{help,tutorials}}/CMakeLists.txt || die "sed failed"
+				fi
+			done
+		done
+	fi
+	# hack or dev-vcs/bzrtools
+	sed 's|bzr patch -p0|patch -p0 -i|g' -i CMakeModules/download_boost.cmake
+
+	#fdo
+	sed -e 's/Categories=Development;Electronics$/Categories=Development;Electronics;/' \
+		-i resources/linux/mime/applications/*.desktop || die 'sed failed'
+
+	# Add important doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
+
+	# Handle optional minimal install
+	if use minimal; then
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
+	else
+		sed '/add_subdirectory( bitmaps_png )/a add_subdirectory( kicad-library )' -i CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,/# /d' -i kicad-library/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add documentation and fix necessary code if requested
+	if use doc; then
+		sed '/add_subdirectory( bitmaps_png )/a add_subdirectory( kicad-doc )' -i CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,$d' -i kicad-doc/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples; then
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
+	else
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
+	fi
+}
+
+src_configure() {
+	bzr whoami "anonymous"
+	if use amd64;then
+		append-cxxflags -fPIC
+	fi
+	need-wxwidgets unicode
+
+	mycmakeargs="${mycmakeargs}
+		-DKICAD_DOCS=/usr/share/doc/${PF}
+		-DKICAD_HELP=/usr/share/doc/${PF}
+		-DKICAD_CYRILLIC=ON
+		-DwxUSE_UNICODE=ON
+		-DKICAD_TESTING_VERSION=ON
+		-DKICAD_MINIZIP=OFF
+		-DKICAD_AUIMANAGER=OFF
+		-DKICAD_AUITOOLBAR=OFF
+		$(cmake-utils_use gost KICAD_GOST)
+		$(cmake-utils_use nanometr USE_PCBNEW_NANOMETRES)
+		$(cmake-utils_use sexpr USE_PCBNEW_SEXPR_FILE_FORMAT)
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	use dev-doc && doxygen Doxyfile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use dev-doc ; then
+		insinto /usr/share/doc/${PF}
+		doins uncrustify.cfg
+		cd Documentation
+		doins -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/*
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge kicad without the 'minimal' USE flag."
+		elog
+	fi
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-999999999.ebuild b/sci-electronics/kicad/kicad-999999999.ebuild
new file mode 100644
index 0000000..dcdcceb
--- /dev/null
+++ b/sci-electronics/kicad/kicad-999999999.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils wxwidgets fdo-mime gnome2-utils bzr python-r1 flag-o-matic
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+EBZR_REPO_URI="lp:kicad"
+EBZR_REVISION="${PR#r}"
+[[ "${EBZR_REVISION}" == "0" ]] && EBZR_REVISION=""
+
+KEYWORDS=""
+
+IUSE="dev-doc debug doc examples minimal python nanometr gost sexpr github"
+
+LANGS="bg ca cs de el_GR en es fi fr hu it ja ko nl pl pt ru sl sv zh_CN"
+
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+CDEPEND="x11-libs/wxGTK:2.8[X,opengl,gnome]
+		media-libs/glew"
+DEPEND="${CDEPEND}
+	>=dev-util/cmake-2.6.0
+	>=dev-libs/boost-1.40[python?]
+	app-arch/xz-utils
+	dev-doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	sys-libs/zlib
+	python? ( dev-python/wxpython )
+	sci-electronics/electronics-menu
+	!minimal? ( !sci-electronics/kicad-library )"
+
+src_unpack() {
+	bzr_src_unpack
+
+	if use doc; then
+		EBZR_REPO_URI="lp:~kicad-developers/kicad/doc" \
+		EBZR_PROJECT="kicad-doc" \
+		EBZR_UNPACK_DIR="${EBZR_UNPACK_DIR}/kicad-doc" \
+		EBZR_CACHE_DIR="kicad-doc" \
+		bzr_fetch
+	fi
+
+	if ! use minimal; then
+		EBZR_REPO_URI="lp:~kicad-product-committers/kicad/library" \
+		EBZR_PROJECT="kicad-library" \
+		EBZR_UNPACK_DIR="${EBZR_UNPACK_DIR}/kicad-library" \
+		EBZR_CACHE_DIR="kicad-library" \
+		bzr_fetch
+	fi
+}
+
+src_prepare() {
+	if use python;then
+		# dev-python/wxpython don't support python3
+		sed '/set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)/d' -i CMakeModules/FindPythonLibs.cmake || die "sed failed"
+	fi
+
+	if use doc;then
+		for lang in ${LANGS};do
+			for x in ${lang};do
+				if ! use linguas_${x}; then
+					sed "s| \<${x}\>||" -i kicad-doc/{internat,doc/{help,tutorials}}/CMakeLists.txt || die "sed failed"
+				fi
+			done
+		done
+	fi
+	# hack or dev-vcs/bzrtools
+	sed 's|bzr patch -p0|patch -p0 -i|g' -i CMakeModules/download_boost.cmake
+
+	#fdo
+	sed -e 's/Categories=Development;Electronics$/Categories=Development;Electronics;/' \
+		-i resources/linux/mime/applications/*.desktop || die 'sed failed'
+
+	# Add important doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
+
+	# Handle optional minimal install
+	if use minimal; then
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
+	else
+		sed '/add_subdirectory( bitmaps_png )/a add_subdirectory( kicad-library )' -i CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,/# /d' -i kicad-library/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Add documentation and fix necessary code if requested
+	if use doc; then
+		sed '/add_subdirectory( bitmaps_png )/a add_subdirectory( kicad-doc )' -i CMakeLists.txt || die "sed failed"
+		sed '/make uninstall/,$d' -i kicad-doc/CMakeLists.txt || die "sed failed"
+	fi
+
+	# Install examples in the right place if requested
+	if use examples; then
+		sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
+	else
+		sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
+	fi
+}
+
+src_configure() {
+	bzr whoami "anonymous"
+	if use amd64;then
+		append-cxxflags -fPIC
+	fi
+	need-wxwidgets unicode
+
+	mycmakeargs="${mycmakeargs}
+		-DKICAD_DOCS=/usr/share/doc/${PF}
+		-DKICAD_HELP=/usr/share/doc/${PF}
+		-DKICAD_CYRILLIC=ON
+		-DwxUSE_UNICODE=ON
+		-DKICAD_TESTING_VERSION=ON
+		-DKICAD_MINIZIP=OFF
+		-DKICAD_AUIMANAGER=OFF
+		-DKICAD_AUITOOLBAR=OFF
+		$(cmake-utils_use gost KICAD_GOST)
+		$(cmake-utils_use nanometr USE_PCBNEW_NANOMETRES)
+		$(cmake-utils_use sexpr USE_PCBNEW_SEXPR_FILE_FORMAT)
+		$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
+		$(cmake-utils_use python KICAD_SCRIPTING)
+		$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
+		$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	use dev-doc && doxygen Doxyfile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use dev-doc ; then
+		insinto /usr/share/doc/${PF}
+		doins uncrustify.cfg
+		cd Documentation
+		doins -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/*
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge kicad without the 'minimal' USE flag."
+		elog
+	fi
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/osgearth/ChangeLog b/sci-geosciences/osgearth/ChangeLog
new file mode 100644
index 0000000..400fb55
--- /dev/null
+++ b/sci-geosciences/osgearth/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for sci-geosciences/osgearth
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/ChangeLog,v 1.7 2015/04/04 06:30:32 mr_bones_ Exp $
+
+  04 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/osgearth-2.5-cmake-options.patch, -osgearth-2.5.ebuild:
+  old
+
+  25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
+  drop maintainership
+
+*osgearth-2.6 (10 Oct 2014)
+
+  10 Oct 2014; Julian Ospald <hasufell@gentoo.org> +osgearth-2.6.ebuild,
+  +files/osgearth-2.6-cmake-options.patch,
+  +files/osgearth-2.6-disable-qt5.patch:
+  version bump
+
+*osgearth-2.5 (22 Nov 2013)
+
+  22 Nov 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/osgearth-2.5-cmake-options.patch, +osgearth-2.5.ebuild,
+  -files/osgearth-2.4-FindMiniZip.cmake.patch, -osgearth-2.4.ebuild:
+  version bump, remove old
+
+  03 Nov 2013; Julian Ospald <hasufell@gentoo.org> osgearth-2.4.ebuild:
+  fix dev-lang/v8 dep wrt #484786
+
+  21 Jul 2013; Julian Ospald <hasufell@gentoo.org> osgearth-2.4.ebuild:
+  fix deps
+
+*osgearth-2.4 (21 Jul 2013)
+
+  21 Jul 2013; Julian Ospald <hasufell@gentoo.org> +osgearth-2.4.ebuild,
+  +files/osgearth-2.4-FindMiniZip.cmake.patch, +metadata.xml:
+  initial import
diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest
new file mode 100644
index 0000000..df55d1d
--- /dev/null
+++ b/sci-geosciences/osgearth/Manifest
@@ -0,0 +1,4 @@
+AUX osgearth-2.6-cmake-options.patch 907 SHA256 f079b04d7d3b27a5987e1039f8743eb8a488da9375971a4f5e2f7d325c4c3a9d SHA512 f62ca6d4c9f041e3fd29c591cb408ccd17abb75d8fa49e63300786b8a257daa6a69180699d634b891bb56e25c60bd806b44e59087608d7d8480472f4b613daf2 WHIRLPOOL 1ea811208f56f76ca878f74690de758be231056c3f4b95e91eed120fd700c049097b9a43555e150d7218dd32fbef91c74128c7ef01f0ec2d41af583f33e1dd21
+EBUILD osgearth-9999.ebuild 1613 SHA256 7efbb668e447ef3506721eab2ccfba53d737315d3fb8e2c37f1d5bf47f8fec23 SHA512 ceea964db1dbe8292b5a10c81ad317c12601ce957ed15f4c508913624bde9473fbbaf9120c5802d510a873fed6880cf9dab7de48fa6d15c7bdc7e4925a008e3b WHIRLPOOL 80120c76f50f234994fc6ead61572880bc6f7123b6ecb6aedfe317bc61e3683048d824e0c2c2a8c92dda82673ff0cf83f52ed37b7efd2a7c7a76c124ef347c76
+MISC ChangeLog 1255 SHA256 343571a4e5eeb44d15c37fd6872e79cade80e6089b299b437d5f6337aee79ce9 SHA512 32966315c90540601a63d003bbd5ef2782f51ee779e920598bf6a7dc4d97ba36eebeed41bd8282c520f6877bc5ee8972df989323442c7ca2cb6767bec8592f31 WHIRLPOOL 7447750fe60060285cd3f6558c7b69e43bea977d862de57ff221e400d094e99352fce23ca06979abe6c53046c0c2a78623ff93a26b2b32a8da87036fb186763c
+MISC metadata.xml 793 SHA256 754ec0db76076841b69a00ab79149cb1c8c441d6488e351f49ad2cd0f58759f7 SHA512 907a5959c80668b34f91f928b36e31f381bc9878e86a2b29a84408eeb44b333f1830baa43c3cc906b37aa82d5d6566ea4da789fe1a8f963877e1002ed3e55339 WHIRLPOOL 316a210f73502400715503431f9720218eba2035078de10ef045dfdb1602baf7bc196aa0cce599747a76122433a5a86de6e64b37c7eb852b67b1742773441d93
diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
new file mode 100644
index 0000000..389609b
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
@@ -0,0 +1,30 @@
+commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3
+Author: hasufell <hasufell@gentoo.org>
+Date:   Fri Nov 22 14:06:34 2013 +0100
+
+    add cmake options
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34cd375..dbb4cb4 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,8 +129,17 @@
+ 
+ # JavaScript Engines:
+ SET(V8_DIR "" CACHE PATH "set to base V8 install path")
+-FIND_PACKAGE(V8)
+-FIND_PACKAGE(JavaScriptCore)
++OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON)
++IF(OSGEARTH_USE_V8)
++	FIND_PACKAGE(V8)
++ENDIF(OSGEARTH_USE_V8)
++
++OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON)
++OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON)
++
++IF (OSGEARTH_USE_JAVASCRIPTCORE)
++	FIND_PACKAGE(JavaScriptCore)
++ENDIF (OSGEARTH_USE_JAVASCRIPTCORE)
+ 
+ SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
+ IF (WITH_EXTERNAL_DUKTAPE)
diff --git a/sci-geosciences/osgearth/metadata.xml b/sci-geosciences/osgearth/metadata.xml
new file mode 100644
index 0000000..f1a2be1
--- /dev/null
+++ b/sci-geosciences/osgearth/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		osgEarth is a C++ terrain rendering toolkit. Just create a
+		simple XML file, point it at your imagery, elevation, and
+		vector data, load it into your favorite  OpenSceneGraph
+		application, and go! osgEarth supports all kinds of data and
+		comes with lots of examples to help you get up and running
+		quickly and easily.
+	</longdescription>
+	<upstream>
+		<doc lang="en">http://docs.osgearth.org/en/latest</doc>
+		<bugs-to>https://github.com/gwaldron/osgearth/issues</bugs-to>
+		<remote-id type="github">gwaldron/osgearth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/osgearth/osgearth-9999.ebuild b/sci-geosciences/osgearth/osgearth-9999.ebuild
new file mode 100644
index 0000000..7345101
--- /dev/null
+++ b/sci-geosciences/osgearth/osgearth-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osgearth/osgearth-2.6.ebuild,v 1.1 2014/10/10 20:18:46 hasufell Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph"
+HOMEPAGE="http://osgearth.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/Displacer/osgearth.git"
+else
+        SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz"
+        S=${WORKDIR}/${PN}-${P}
+fi
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc qt4"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-games/openscenegraph-3.2.1[curl,qt4?]
+	dev-libs/tinyxml
+	net-misc/curl
+	sci-libs/gdal
+	sci-libs/geos
+	sys-libs/zlib[minizip]
+	virtual/opengl
+	x11-libs/libX11
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+#PATCHES=( "${FILESDIR}"/${P}-{cmake-options}.patch )
+
+src_configure() {
+	# V8 disabled due to
+	# https://github.com/gwaldron/osgearth/issues/333
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_TINYXML=ON
+		$(cmake-utils_use qt4 OSGEARTH_USE_QT)
+		-DOSGEARTH_USE_V8=OFF
+		-DOSGEARTH_USE_JAVASCRIPTCORE=OFF
+		-DOSGEARTH_USE_LIBNOISE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		emake -C "${S}"/docs man html info
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dohtml -r "${S}"/docs/build/html/*
+		doman "${S}"/docs/build/man/*
+		doinfo "${S}"/docs/build/texinfo/*.info*
+	fi
+}
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
new file mode 100644
index 0000000..e2ac3a6
--- /dev/null
+++ b/sci-libs/gsl/Manifest
@@ -0,0 +1,10 @@
+AUX cblas.pc.in 290 SHA256 f47133de2f49a5ff53c8e295d03fbe8923c79cd0978cedb903cfdf7e57a873a1 SHA512 2a1dc22097e2a50fd4a797c446b32202b74e9d754c8b61c51a3789c3eb42372adcc7fb25901c468d604cc4e7961d7f11e0e5883179894047948e46879fc04719 WHIRLPOOL f8e93aa2c61d3ac08664c3162f0e754c1d6cefca0a4d4ab8ee8f763e6ec46049ff5537c7f9266200856b58ffab88fb9af115eb4be32deb99ed6d2005abcb13ec
+AUX eselect.cblas.gsl 216 SHA256 2be1ba93a0bafa73df52913f54d1c7fd299aa1cd0a98c5fbe4eac894073ebac7 SHA512 e5cd92f4e9829538642a0fed54fdf75bc579c8c20769997ec5a3ce0287993476e68fbeefec8e46162d05ea908d2e79187c15ebdd00f6558ecbd25de21ece64dc WHIRLPOOL 1a0591e670a1ca51fa6cc4b2883931a49f3da59c2c673d786f6acdb72b50b7fee22ee30f2d3c6ac864c149381c23ca5c41ba586f159830cdeff97b86cf6a03f3
+AUX gsl-1.13-cblas-vars.patch 403 SHA256 207b8fe48affca2564fcfffb9a01cca257f6bd1516355fd20cd3389fbb0ced40 SHA512 c323a2f08683f70dbb2c2e1b0d7d1706a74f71d41aad892008d381525cf4a34e0f5d120763f2cf2ad57b0ddf5ee36eeabf401299be821fec66710d12e1c0e8ca WHIRLPOOL 7a0752597eebb47dd4da359a0368c9c1a755ee607b53651d040dd3bb4f58746e234cdafd77d3e259f0f028572161719472a881441caebbf2860c1dd40d4a795e
+AUX gsl-1.13-cblas.patch 15524 SHA256 77e8a1df3d27723621efd41dc817699eef21f6b77717ad96f4d929f871524890 SHA512 ed96a576a4c218d002e091088f04e2654c651d0050e8487ef69686fd7715bf59cd56c40751bcf558314dff59ece8acb47bfa28d3a405b2ecf3fc56e30d46bdaa WHIRLPOOL c9e7146512e16a65f35687a7f832c9e0e958c6b7d7471a61527eeac3fcb616c5a16cc26ab483b8cefa194cb232a662439a06625da38cb8b86bdf0f5444ad25d5
+AUX gsl-1.14-cblas.patch 17218 SHA256 82b88b7a8cbe6f1020a7474726e92b7ce1ec152ad7388f80f719a47d8d64699d SHA512 8d009f7b7e4c6cb90864b90cc86a8c5b6b3d80d899225758683639d0e1a114355bd4f8adfb41bc9ead57990a3274cff65743c59b86fc1bc699c46a61fb31fd42 WHIRLPOOL f3b52170a5818a5d8d2812272fbbdd688626cbeb8679fb0eb16fb34a7e85a88da3302b3a4f79264e9ae39c79143f3bf5db90d678c04a2d34bcf186962e990b70
+AUX gsl-1.15-cblas.patch 17217 SHA256 1d69dd2d1b37abd541b86fed2b28e9f63e947f92f1b85af1c2f83074b12a8491 SHA512 fd099610b612b44a8b8ab8efd6350894fe7df46c94cf20e9d4377360c4cc31b11a8d9e18f6db6db9d8f4b7098b1d1569167ddb29e30396c656e381d25c1ec852 WHIRLPOOL 4794cfb018f50e59e11eb60bf11d348a7131360d757868aa9f08e75f432ee786d82143cdb3743ce3a526649cc2877b45dbe14eb49464cea9f23add0db87638b5
+AUX gsl-1.16-cblas.patch 17458 SHA256 568f6bf06b9441f741c028eaf7b12edb0e96093a16ea7a2d975e0cbde261c083 SHA512 70cae5682bfc7788e6f67ec355b52e291f32c2500b9baf9dd336d7cbb42b5eac4d89ecafeb23c4b478836d3c137d40d47dd17d375708df3c2dd41781a78f56bf WHIRLPOOL a7a5e6b52dc0466ad180853f5824d071d715743ef850ec808c7615fcc3b4f98d940c6f896faf44647c8e0915a6e5b6b7575ff9b66a59e337e04cd18d94cc7807
+DIST gsl-1.16.tar.gz 3534080 SHA256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 SHA512 94e998953f30d701e1cd0a5e05d572c5cca7b6f40f0533aa85394ba4218946826408093ffe3049a0ab13d6ba87034fcec1a7d52a67d0b8860dc02b5fd4feb8eb WHIRLPOOL 46bf814c882ca36600d258097642a734b6a6483302cc64c14cab55c0c056ae6116c204495b3b81c57fec1871e145fbc5aa3900006e52e494e9e2fcd34ec06301
+EBUILD gsl-1.16-r1.ebuild 3209 SHA256 676ee9090e035789aa05611d066c5da966d66ac3b19f4e654c00641e8ff03ca6 SHA512 eb6cbee8e525f04397497659b2b79db8d7d0346e73b92a9f1f28fc52833348d614698e609ad98493e28417ce6cf4b795e2ca38686e6953e0a31fc4292f0457d7 WHIRLPOOL efced46f5fa5747db08a1fe16133c3970a6cf749a50ea1a6e5b8be9e87e41daeb13053e7d199158f8b6a4091354c99b075b91ed419343913c5665bed11f4f004
+MISC 0001-multilib-gsl.patch 1258 SHA256 d5f38018d0cd4b3258369a8acadf9ff5e8ce36a8e2713d85e069f3ebb03c9916 SHA512 e2b5740d119d951bfdf7e4977b41eab20f44bc6eb6e96b7f5e9d2858f6c1534a82924bb13516876a84ecdbef712cb53559da6d48f1dfff2c22e2b8cf9571b040 WHIRLPOOL 730b41964316ae6a69a0aff9bc9e6220aff6851ca3e8eea8f0a900ad929c93c87d70a32feee161d7bdfa22cde8a414dc7cdd965025cad7421b93f93a79e0abe0
diff --git a/sci-libs/gsl/files/cblas.pc.in b/sci-libs/gsl/files/cblas.pc.in
new file mode 100644
index 0000000..a2580f8
--- /dev/null
+++ b/sci-libs/gsl/files/cblas.pc.in
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=${prefix}/include
+
+Name: cblas
+Description: GSL C Implementation of the Basic Linear Algebra Subprograms
+Version: @PV@
+URL: http://www.gnu.org/software/gsl
+Libs: -L${libdir} -lcblas
+Libs.private: -lm
+Cflags: -I${includedir}
diff --git a/sci-libs/gsl/files/eselect.cblas.gsl b/sci-libs/gsl/files/eselect.cblas.gsl
new file mode 100644
index 0000000..af6fee5
--- /dev/null
+++ b/sci-libs/gsl/files/eselect.cblas.gsl
@@ -0,0 +1,5 @@
+libgslcblas.so /usr/@LIBDIR@/libcblas.so
+libgslcblas.so.0 /usr/@LIBDIR@/libcblas.so.0
+libgslcblas.a /usr/@LIBDIR@/libcblas.a
+../blas/gsl/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
+gsl/gsl_cblas.h /usr/include/cblas.h
diff --git a/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch b/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch
new file mode 100644
index 0000000..47f06ca
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.13-cblas-vars.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2009-09-20 22:41:14.000000000 +0400
++++ Makefile.am	2009-09-20 22:39:10.000000000 +0400
+@@ -55,6 +55,8 @@
+ 	-e 's|@includedir[@]|$(includedir)|g' \
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
diff --git a/sci-libs/gsl/files/gsl-1.13-cblas.patch b/sci-libs/gsl/files/gsl-1.13-cblas.patch
new file mode 100644
index 0000000..be86c3a
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.13-cblas.patch
@@ -0,0 +1,260 @@
+--- acx_cblas.m4.orig	1970-01-01 01:00:00.000000000 +0100
++++ acx_cblas.m4	2009-01-19 15:45:43.319918648 +0000
+@@ -0,0 +1,60 @@
++AC_DEFUN([ACX_CBLAS],[
++  use_cblas=no
++  use_cblas_libs="-lcblas -lblas"
++  use_cblas_cflags=""
++
++  AC_ARG_WITH(cblas,
++	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
++
++  case $with_cblas in
++	yes) use_cblas=yes ;;
++	no | "" ) use_cblas=no ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
++	*) use_cblas_libs="-l$with_cblas" ;;
++  esac
++
++  AC_ARG_WITH(cblas-libs,
++	[AS_HELP_STRING([--with-cblas-libs=<libs>],
++	 [external cblas libraries to link with (default is "$use_cblas_libs")])],
++	[use_cblas_libs=$withval], [])
++
++  AC_ARG_WITH(cblas-cflags,
++	[AS_HELP_STRING([--with-cblas-cflags=<flags>],
++	 [extra cflags to compile with external cblas ("-I<dir>")])],
++	[use_cblas_cflags=$withval], [])
++
++  if test x$use_cblas != xno; then
++	if test "x$CBLAS_LIBS" = x; then
++		CBLAS_LIBS="$use_cblas_libs"
++     	fi
++     	if test "x$CBLAS_FLAGS" = x; then
++       		CBLAS_CFLAGS="$use_cblas_cflags"
++   	fi
++
++   	CFLAGS_sav="$CFLAGS"
++   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++   	AC_CHECK_HEADER(cblas.h, ,
++		[AC_MSG_ERROR([
++	   	*** Header file cblas.h not found.
++	   	*** If you installed cblas header in a non standard place,
++	   	*** specify its install prefix using the following option
++	   	***  --with-cblas-cflags="-I<include_dir>"])
++	 	])
++   	CFLAGS="$CFLAGS_sav"
++
++   	LIBS_sav="$LIBS"
++   	LIBS="$LIBS $CBLAS_LIBS -lm"
++   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++   	AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes],
++    		[AC_MSG_ERROR([
++	    	*** Linking with cblas with $LIBS failed.
++       	    	*** If you installed cblas library in a non standard place,
++   	    	*** specify its install prefix using the following option
++	    	***  --with-cblas-libs="-L<lib_dir> -l<lib>"])
++	 	])
++   	AC_MSG_RESULT($use_cblas)
++   	LIBS="$LIBS_sav"
++	AC_SUBST(CBLAS_CFLAGS)
++	AC_SUBST(CBLAS_LIBS)
++ fi
++])
+--- bspline/Makefile.am.orig	2009-06-29 13:30:17.000000000 +0100
++++ bspline/Makefile.am	2009-09-17 22:31:53.000000000 +0100
+@@ -12,6 +12,6 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
++test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
+ 
+ test_SOURCES = test.c
+--- configure.ac.orig	2008-12-15 14:52:45.000000000 +0000
++++ configure.ac	2009-01-19 15:45:36.267801871 +0000
+@@ -169,6 +169,16 @@
+   AC_CHECK_LIB(m, cos)
+ fi
+ 
++sinclude(acx_cblas.m4)
++ACX_CBLAS
++if test "x$CBLAS_LIBS" != "x"; then
++   CBLAS_LINK_LIBS="$CBLAS_LIBS"
++else
++   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
++   CBLAS_LIBS="-lgslcblas"
++fi
++AC_SUBST(CBLAS_LINK_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>]) 
+--- eigen/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ eigen/Makefile.am	2009-01-19 15:46:59.999090878 +0000
+@@ -11,7 +11,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
++test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+ 
+ test_SOURCES = test.c
+ 
+--- gsl-config.in.orig	2008-02-05 13:22:10.000000000 +0000
++++ gsl-config.in	2009-01-19 15:45:06.176046040 +0000
+@@ -58,11 +58,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @GSL_CFLAGS@ 
++       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
++        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+        	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
+        	;;
+ 
+--- gsl.pc.in.orig	2008-11-19 09:13:46.000000000 +0000
++++ gsl.pc.in	2009-01-19 15:45:15.227937645 +0000
+@@ -6,5 +6,5 @@
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ -lgslcblas @LIBS@
+-Cflags: @GSL_CFLAGS@
++Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
++Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
+--- interpolation/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ interpolation/Makefile.am	2009-01-19 15:47:00.019091996 +0000
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+--- linalg/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ linalg/Makefile.am	2009-01-19 15:47:00.023091716 +0000
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+--- Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ Makefile.am	2009-01-19 15:45:50.463861656 +0000
+@@ -17,13 +17,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -33,10 +32,10 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+ 
+ check_SCRIPTS = test_gsl_histogram.sh
+ TESTS = test_gsl_histogram.sh
+--- multifit/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ multifit/Makefile.am	2009-01-19 15:47:00.031091716 +0000
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+--- multimin/Makefile.am.orig	2008-11-29 17:51:18.000000000 +0000
++++ multimin/Makefile.am	2009-01-19 15:47:00.035091996 +0000
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS) 
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ #demo_SOURCES = demo.c 
+-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+--- multiroots/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ multiroots/Makefile.am	2009-01-19 15:47:00.035091996 +0000
+@@ -15,5 +15,5 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+--- ode-initval/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ ode-initval/Makefile.am	2009-01-19 15:47:00.039090878 +0000
+@@ -12,7 +12,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
++test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
+ 
+ test_SOURCES = test.c
+ 
+--- poly/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ poly/Makefile.am	2009-01-19 15:47:00.047090599 +0000
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-check_PROGRAMS = test
++#check_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+--- specfunc/Makefile.am.orig	2008-11-27 20:03:28.000000000 +0000
++++ specfunc/Makefile.am	2009-01-19 15:47:00.063090599 +0000
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
+   
+--- wavelet/Makefile.am.orig	2008-11-27 20:03:29.000000000 +0000
++++ wavelet/Makefile.am	2009-01-19 15:47:00.163091437 +0000
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
diff --git a/sci-libs/gsl/files/gsl-1.14-cblas.patch b/sci-libs/gsl/files/gsl-1.14-cblas.patch
new file mode 100644
index 0000000..b8d9fb7
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.14-cblas.patch
@@ -0,0 +1,285 @@
+diff -Nur gsl-1.14.orig/acx_cblas.m4 gsl-1.14/acx_cblas.m4
+--- gsl-1.14.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
++++ gsl-1.14/acx_cblas.m4	2010-04-09 02:19:59.000000000 +0100
+@@ -0,0 +1,60 @@
++AC_DEFUN([ACX_CBLAS],[
++  use_cblas=no
++  use_cblas_libs="-lcblas -lblas"
++  use_cblas_cflags=""
++
++  AC_ARG_WITH(cblas,
++	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
++
++  case $with_cblas in
++	yes) use_cblas=yes ;;
++	no | "" ) use_cblas=no ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
++	*) use_cblas_libs="-l$with_cblas" ;;
++  esac
++
++  AC_ARG_WITH(cblas-libs,
++	[AS_HELP_STRING([--with-cblas-libs=<libs>],
++	 [external cblas libraries to link with (default is "$use_cblas_libs")])],
++	[use_cblas_libs=$withval], [])
++
++  AC_ARG_WITH(cblas-cflags,
++	[AS_HELP_STRING([--with-cblas-cflags=<flags>],
++	 [extra cflags to compile with external cblas ("-I<dir>")])],
++	[use_cblas_cflags=$withval], [])
++
++  if test x$use_cblas != xno; then
++	if test "x$CBLAS_LIBS" = x; then
++		CBLAS_LIBS="$use_cblas_libs"
++     	fi
++     	if test "x$CBLAS_FLAGS" = x; then
++       		CBLAS_CFLAGS="$use_cblas_cflags"
++   	fi
++
++   	CFLAGS_sav="$CFLAGS"
++   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++   	AC_CHECK_HEADER(cblas.h, ,
++		[AC_MSG_ERROR([
++	   	*** Header file cblas.h not found.
++	   	*** If you installed cblas header in a non standard place,
++	   	*** specify its install prefix using the following option
++	   	***  --with-cblas-cflags="-I<include_dir>"])
++	 	])
++   	CFLAGS="$CFLAGS_sav"
++
++   	LIBS_sav="$LIBS"
++   	LIBS="$LIBS $CBLAS_LIBS -lm"
++   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++   	AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes],
++    		[AC_MSG_ERROR([
++	    	*** Linking with cblas with $LIBS failed.
++       	    	*** If you installed cblas library in a non standard place,
++   	    	*** specify its install prefix using the following option
++	    	***  --with-cblas-libs="-L<lib_dir> -l<lib>"])
++	 	])
++   	AC_MSG_RESULT($use_cblas)
++   	LIBS="$LIBS_sav"
++	AC_SUBST(CBLAS_CFLAGS)
++	AC_SUBST(CBLAS_LIBS)
++ fi
++])
+diff -Nur gsl-1.14.orig/bspline/Makefile.am gsl-1.14/bspline/Makefile.am
+--- gsl-1.14.orig/bspline/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/bspline/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -12,6 +12,6 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
++test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
+ 
+ test_SOURCES = test.c
+diff -Nur gsl-1.14.orig/configure.ac gsl-1.14/configure.ac
+--- gsl-1.14.orig/configure.ac	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/configure.ac	2010-04-09 02:19:59.000000000 +0100
+@@ -185,6 +185,16 @@
+   AC_CHECK_LIB(m, cos)
+ fi
+ 
++sinclude(acx_cblas.m4)
++ACX_CBLAS
++if test "x$CBLAS_LIBS" != "x"; then
++   CBLAS_LINK_LIBS="$CBLAS_LIBS"
++else
++   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
++   CBLAS_LIBS="-lgslcblas"
++fi
++AC_SUBST(CBLAS_LINK_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>]) 
+diff -Nur gsl-1.14.orig/eigen/Makefile.am gsl-1.14/eigen/Makefile.am
+--- gsl-1.14.orig/eigen/Makefile.am	2010-04-09 02:04:46.000000000 +0100
++++ gsl-1.14/eigen/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
++test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.14.orig/gsl-config.in gsl-1.14/gsl-config.in
+--- gsl-1.14.orig/gsl-config.in	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/gsl-config.in	2010-04-09 02:19:59.000000000 +0100
+@@ -58,11 +58,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @GSL_CFLAGS@ 
++       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
++        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+        	echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm
+        	;;
+ 
+diff -Nur gsl-1.14.orig/gsl.pc.in gsl-1.14/gsl.pc.in
+--- gsl-1.14.orig/gsl.pc.in	2010-04-09 02:04:46.000000000 +0100
++++ gsl-1.14/gsl.pc.in	2010-04-09 02:19:59.000000000 +0100
+@@ -6,5 +6,5 @@
+ Name: GSL
+ Description: GNU Scientific Library
+ Version: @VERSION@
+-Libs: @GSL_LIBS@ -lgslcblas @LIBS@
+-Cflags: @GSL_CFLAGS@
++Libs: @GSL_LIBS@ @CBLAS_LIBS@ @LIBS@
++Cflags: @GSL_CFLAGS@ @CBLAS_CFLAGS@
+diff -Nur gsl-1.14.orig/interpolation/Makefile.am gsl-1.14/interpolation/Makefile.am
+--- gsl-1.14.orig/interpolation/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/interpolation/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.14.orig/linalg/Makefile.am gsl-1.14/linalg/Makefile.am
+--- gsl-1.14.orig/linalg/Makefile.am	2010-04-09 02:04:46.000000000 +0100
++++ gsl-1.14/linalg/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.14.orig/Makefile.am gsl-1.14/Makefile.am
+--- gsl-1.14.orig/Makefile.am	2010-04-09 02:04:46.000000000 +0100
++++ gsl-1.14/Makefile.am	2010-04-09 02:20:13.000000000 +0100
+@@ -19,13 +19,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,10 +34,10 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+ 
+ check_SCRIPTS = test_gsl_histogram.sh
+ TESTS = test_gsl_histogram.sh
+@@ -56,6 +55,8 @@
+ 	-e 's|@includedir[@]|$(includedir)|g' \
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
+diff -Nur gsl-1.14.orig/multifit/Makefile.am gsl-1.14/multifit/Makefile.am
+--- gsl-1.14.orig/multifit/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/multifit/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+diff -Nur gsl-1.14.orig/multimin/Makefile.am gsl-1.14/multimin/Makefile.am
+--- gsl-1.14.orig/multimin/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/multimin/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS) 
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ #demo_SOURCES = demo.c 
+-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.14.orig/multiroots/Makefile.am gsl-1.14/multiroots/Makefile.am
+--- gsl-1.14.orig/multiroots/Makefile.am	2010-04-09 02:04:46.000000000 +0100
++++ gsl-1.14/multiroots/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -15,5 +15,5 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.14.orig/ode-initval/Makefile.am gsl-1.14/ode-initval/Makefile.am
+--- gsl-1.14.orig/ode-initval/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/ode-initval/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
++test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.14.orig/poly/Makefile.am gsl-1.14/poly/Makefile.am
+--- gsl-1.14.orig/poly/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/poly/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-check_PROGRAMS = test
++#check_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+diff -Nur gsl-1.14.orig/specfunc/Makefile.am gsl-1.14/specfunc/Makefile.am
+--- gsl-1.14.orig/specfunc/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/specfunc/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
+   
+diff -Nur gsl-1.14.orig/wavelet/Makefile.am gsl-1.14/wavelet/Makefile.am
+--- gsl-1.14.orig/wavelet/Makefile.am	2010-04-09 02:04:47.000000000 +0100
++++ gsl-1.14/wavelet/Makefile.am	2010-04-09 02:19:59.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
diff --git a/sci-libs/gsl/files/gsl-1.15-cblas.patch b/sci-libs/gsl/files/gsl-1.15-cblas.patch
new file mode 100644
index 0000000..dd402f3
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.15-cblas.patch
@@ -0,0 +1,286 @@
+diff -Nur gsl-1.15.orig/acx_cblas.m4 gsl-1.15/acx_cblas.m4
+--- gsl-1.15.orig/acx_cblas.m4	1970-01-01 01:00:00.000000000 +0100
++++ gsl-1.15/acx_cblas.m4	2011-07-28 22:16:03.000000000 +0100
+@@ -0,0 +1,60 @@
++AC_DEFUN([ACX_CBLAS],[
++  use_cblas=no
++  use_cblas_libs="-lcblas -lblas"
++  use_cblas_cflags=""
++
++  AC_ARG_WITH(cblas,
++	[AS_HELP_STRING([--with-cblas], [use external CBLAS library (default is no)])])
++
++  case $with_cblas in
++	yes) use_cblas=yes ;;
++	no | "" ) use_cblas=no ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) use_cblas_libs="$with_cblas" ;;
++	*) use_cblas_libs="-l$with_cblas" ;;
++  esac
++
++  AC_ARG_WITH(cblas-libs,
++	[AS_HELP_STRING([--with-cblas-libs=<libs>],
++	 [external cblas libraries to link with (default is "$use_cblas_libs")])],
++	[use_cblas_libs=$withval], [])
++
++  AC_ARG_WITH(cblas-cflags,
++	[AS_HELP_STRING([--with-cblas-cflags=<flags>],
++	 [extra cflags to compile with external cblas ("-I<dir>")])],
++	[use_cblas_cflags=$withval], [])
++
++  if test x$use_cblas != xno; then
++	if test "x$CBLAS_LIBS" = x; then
++		CBLAS_LIBS="$use_cblas_libs"
++     	fi
++     	if test "x$CBLAS_FLAGS" = x; then
++       		CBLAS_CFLAGS="$use_cblas_cflags"
++   	fi
++
++   	CFLAGS_sav="$CFLAGS"
++   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++   	AC_CHECK_HEADER(cblas.h, ,
++		[AC_MSG_ERROR([
++	   	*** Header file cblas.h not found.
++	   	*** If you installed cblas header in a non standard place,
++	   	*** specify its install prefix using the following option
++	   	***  --with-cblas-cflags="-I<include_dir>"])
++	 	])
++   	CFLAGS="$CFLAGS_sav"
++
++   	LIBS_sav="$LIBS"
++   	LIBS="$LIBS $CBLAS_LIBS -lm"
++   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++   	AC_TRY_LINK_FUNC(cblas_sgemm, [use_cblas=yes],
++    		[AC_MSG_ERROR([
++	    	*** Linking with cblas with $LIBS failed.
++       	    	*** If you installed cblas library in a non standard place,
++   	    	*** specify its install prefix using the following option
++	    	***  --with-cblas-libs="-L<lib_dir> -l<lib>"])
++	 	])
++   	AC_MSG_RESULT($use_cblas)
++   	LIBS="$LIBS_sav"
++	AC_SUBST(CBLAS_CFLAGS)
++	AC_SUBST(CBLAS_LIBS)
++ fi
++])
+diff -Nur gsl-1.15.orig/bspline/Makefile.am gsl-1.15/bspline/Makefile.am
+--- gsl-1.15.orig/bspline/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/bspline/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -12,6 +12,6 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
++test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
+ 
+ test_SOURCES = test.c
+diff -Nur gsl-1.15.orig/configure.ac gsl-1.15/configure.ac
+--- gsl-1.15.orig/configure.ac	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/configure.ac	2011-07-28 22:16:03.000000000 +0100
+@@ -190,6 +190,16 @@
+   AC_CHECK_LIB(m, cos)
+ fi
+ 
++sinclude(acx_cblas.m4)
++ACX_CBLAS
++if test "x$CBLAS_LIBS" != "x"; then
++   CBLAS_LINK_LIBS="$CBLAS_LIBS"
++else
++   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
++   CBLAS_LIBS="-lgslcblas"
++fi
++AC_SUBST(CBLAS_LINK_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>]) 
+diff -Nur gsl-1.15.orig/eigen/Makefile.am gsl-1.15/eigen/Makefile.am
+--- gsl-1.15.orig/eigen/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/eigen/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
++test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.15.orig/gsl-config.in gsl-1.15/gsl-config.in
+--- gsl-1.15.orig/gsl-config.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl-config.in	2011-07-28 22:16:03.000000000 +0100
+@@ -58,11 +58,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @GSL_CFLAGS@ 
++       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ 
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
++        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+ 	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
+        	;;
+ 
+diff -Nur gsl-1.15.orig/gsl.pc.in gsl-1.15/gsl.pc.in
+--- gsl-1.15.orig/gsl.pc.in	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/gsl.pc.in	2011-07-28 22:20:14.000000000 +0100
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
++GSL_CBLAS_LIB=@CBLAS_LIBS@
+ 
+ Name: GSL
+ Description: GNU Scientific Library
+diff -Nur gsl-1.15.orig/interpolation/Makefile.am gsl-1.15/interpolation/Makefile.am
+--- gsl-1.15.orig/interpolation/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/interpolation/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.15.orig/linalg/Makefile.am gsl-1.15/linalg/Makefile.am
+--- gsl-1.15.orig/linalg/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/linalg/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.15.orig/Makefile.am gsl-1.15/Makefile.am
+--- gsl-1.15.orig/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -19,13 +19,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,10 +34,10 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+ 
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+ TESTS = test_gsl_histogram.sh pkgconfig.test
+@@ -57,6 +56,8 @@
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
+diff -Nur gsl-1.15.orig/multifit/Makefile.am gsl-1.15/multifit/Makefile.am
+--- gsl-1.15.orig/multifit/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multifit/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+diff -Nur gsl-1.15.orig/multimin/Makefile.am gsl-1.15/multimin/Makefile.am
+--- gsl-1.15.orig/multimin/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multimin/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS) 
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ #demo_SOURCES = demo.c 
+-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.15.orig/multiroots/Makefile.am gsl-1.15/multiroots/Makefile.am
+--- gsl-1.15.orig/multiroots/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/multiroots/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -15,5 +15,5 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.15.orig/ode-initval/Makefile.am gsl-1.15/ode-initval/Makefile.am
+--- gsl-1.15.orig/ode-initval/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/ode-initval/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
++test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.15.orig/poly/Makefile.am gsl-1.15/poly/Makefile.am
+--- gsl-1.15.orig/poly/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/poly/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-check_PROGRAMS = test
++#check_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+diff -Nur gsl-1.15.orig/specfunc/Makefile.am gsl-1.15/specfunc/Makefile.am
+--- gsl-1.15.orig/specfunc/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/specfunc/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
+   
+diff -Nur gsl-1.15.orig/wavelet/Makefile.am gsl-1.15/wavelet/Makefile.am
+--- gsl-1.15.orig/wavelet/Makefile.am	2011-07-28 22:15:49.000000000 +0100
++++ gsl-1.15/wavelet/Makefile.am	2011-07-28 22:16:03.000000000 +0100
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas.patch b/sci-libs/gsl/files/gsl-1.16-cblas.patch
new file mode 100644
index 0000000..c29ef52
--- /dev/null
+++ b/sci-libs/gsl/files/gsl-1.16-cblas.patch
@@ -0,0 +1,294 @@
+diff -Nur gsl-1.16.orig/ax_cblas.m4 gsl-1.16/ax_cblas.m4
+--- gsl-1.16.orig/ax_cblas.m4	1969-12-31 16:00:00.000000000 -0800
++++ gsl-1.16/ax_cblas.m4	2013-08-19 15:48:54.376300825 -0700
+@@ -0,0 +1,69 @@
++AC_DEFUN([AX_CBLAS],[
++
++  ext_cblas=no
++  ext_cblas_libs="-lcblas"
++  ext_cblas_cflags=""
++
++  AC_ARG_WITH(cblas-external,
++	[AS_HELP_STRING([--with-cblas-external], 
++			[Use external CBLAS library (default is no)])],
++	[with_ext_cblas=$withval],
++	[with_ext_cblas=no])
++
++  case $with_ext_cblas in
++	no) ext_cblas=no ;;
++	yes) ext_cblas=yes ;;
++	-* | */* | *.a | *.so | *.so.* | *.o) 
++	   ext_cblas=yes
++	   ext_cblas_libs="$with_cblas" ;;
++	*) ext_cblas=yes
++	   ext_cblas_libs="-l$with_cblas" ;;
++  esac
++
++  AC_ARG_WITH(cblas-external-libs,
++	[AS_HELP_STRING([--with-cblas-external-libs=<libs>],
++			[External cblas libraries to link with (default is "$ext_cblas_libs")])],
++	[ext_cblas_libs=$withval],
++	[])
++
++  AC_ARG_WITH(cblas-external-cflags,
++	[AS_HELP_STRING([--with-cblas-external-cflags=<flags>],
++			[Pre-processing flags to compile with external cblas ("-I<dir>")])],
++	[ext_cblas_cflags=$withval],
++	[])
++
++  if test x$ext_cblas != xno; then
++	if test "x$CBLAS_LIBS" = x; then
++	   CBLAS_LIBS="$ext_cblas_libs"
++     	fi
++     	if test "x$CBLAS_CFLAGS" = x; then
++       	   CBLAS_CFLAGS="$ext_cblas_cflags"
++   	fi
++
++   	CFLAGS_sav="$CFLAGS"
++   	CFLAGS="$CFLAGS $CBLAS_CFLAGS"
++   	AC_CHECK_HEADER(cblas.h, ,
++		[AC_MSG_ERROR([
++	   	*** Header file cblas.h not found.
++	   	*** If you installed cblas header in a non standard place,
++	   	*** specify its install prefix using the following option
++	   	***  --with-cblas-external-cflags="-I<include_dir>"])
++	 	])
++   	CFLAGS="$CFLAGS_sav"
++
++   	LIBS_sav="$LIBS"
++   	LIBS="$LIBS $CBLAS_LIBS -lm"
++   	AC_MSG_CHECKING([for cblas_sgemm in $CBLAS_LIBS])
++   	AC_TRY_LINK_FUNC(cblas_sgemm, [ext_cblas=yes],
++    		[AC_MSG_ERROR([
++	    	*** Linking with cblas with $LIBS failed.
++       	    	*** If you installed cblas library in a non standard place,
++   	    	*** specify its install prefix using the following option
++	    	***  --with-cblas-external-libs="-L<lib_dir> -l<lib>"])
++	 	])
++   	AC_MSG_RESULT($ext_cblas)
++   	LIBS="$LIBS_sav"
++	AC_SUBST([CBLAS_CFLAGS])
++	AC_SUBST([CBLAS_LIBS])
++ fi
++])
+diff -Nur gsl-1.16.orig/bspline/Makefile.am gsl-1.16/bspline/Makefile.am
+--- gsl-1.16.orig/bspline/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/bspline/Makefile.am	2013-08-19 15:25:27.728497742 -0700
+@@ -12,6 +12,6 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
++test_LDADD = libgslbspline.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../statistics/libgslstatistics.la
+ 
+ test_SOURCES = test.c
+diff -Nur gsl-1.16.orig/configure.ac gsl-1.16/configure.ac
+--- gsl-1.16.orig/configure.ac	2013-07-19 08:14:45.000000000 -0700
++++ gsl-1.16/configure.ac	2013-08-19 15:28:24.172640793 -0700
+@@ -191,6 +191,16 @@
+   AC_CHECK_LIB(m, cos)
+ fi
+ 
++sinclude(ax_cblas.m4)
++AX_CBLAS
++if test "x$CBLAS_LIBS" != "x"; then
++   CBLAS_LINK_LIBS="$CBLAS_LIBS"
++else
++   CBLAS_LINK_LIBS="\$(top_builddir)/cblas/libgslcblas.la"
++   CBLAS_LIBS="-lgslcblas"
++fi
++AC_SUBST(CBLAS_LINK_LIBS)
++
+ dnl Remember to put a definition in acconfig.h for each of these
+ AC_CHECK_DECLS(feenableexcept,,,[#define _GNU_SOURCE 1
+ #include <fenv.h>]) 
+diff -Nur gsl-1.16.orig/eigen/Makefile.am gsl-1.16/eigen/Makefile.am
+--- gsl-1.16.orig/eigen/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/eigen/Makefile.am	2013-08-19 15:25:27.728497742 -0700
+@@ -11,7 +11,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
++test_LDADD = libgsleigen.la  ../test/libgsltest.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../sys/libgslsys.la ../err/libgslerr.la ../utils/libutils.la ../rng/libgslrng.la ../sort/libgslsort.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.16.orig/gsl-config.in gsl-1.16/gsl-config.in
+--- gsl-1.16.orig/gsl-config.in	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl-config.in	2013-08-19 15:25:27.728497742 -0700
+@@ -58,11 +58,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo @GSL_CFLAGS@ 
++       	echo @GSL_CFLAGS@ @CBLAS_CFLAGS@ 
+        	;;
+ 
+     --libs)
+-        : ${GSL_CBLAS_LIB=-lgslcblas}
++        : ${GSL_CBLAS_LIB=@CBLAS_LIBS@}
+ 	echo @GSL_LIBS@ $GSL_CBLAS_LIB @GSL_LIBM@
+        	;;
+ 
+diff -Nur gsl-1.16.orig/gsl.pc.in gsl-1.16/gsl.pc.in
+--- gsl-1.16.orig/gsl.pc.in	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/gsl.pc.in	2013-08-19 15:25:27.728497742 -0700
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-GSL_CBLAS_LIB=-lgslcblas
++GSL_CBLAS_LIB=@CBLAS_LIBS@
+ 
+ Name: GSL
+ Description: GNU Scientific Library
+diff -Nur gsl-1.16.orig/interpolation/Makefile.am gsl-1.16/interpolation/Makefile.am
+--- gsl-1.16.orig/interpolation/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/interpolation/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../cblas/libgslcblas.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslinterpolation.la ../poly/libgslpoly.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la @CBLAS_LINK_LIBS@ ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.16.orig/linalg/Makefile.am gsl-1.16/linalg/Makefile.am
+--- gsl-1.16.orig/linalg/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/linalg/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
+--- gsl-1.16.orig/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -19,13 +19,12 @@
+ 
+ lib_LTLIBRARIES = libgsl.la
+ libgsl_la_SOURCES = version.c
+-libgsl_la_LIBADD = $(SUBLIBS)
++libgsl_la_LIBADD = $(SUBLIBS) @CBLAS_LINK_LIBS@
+ libgsl_la_LDFLAGS = -version-info $(GSL_LT_VERSION)
+ noinst_HEADERS = templates_on.h templates_off.h build.h
+ 
+ MINGW32_HOST = @MINGW32_HOST@
+ if MINGW32_HOST
+-libgsl_la_LIBADD += cblas/libgslcblas.la
+ libgsl_la_LDFLAGS += -no-undefined
+ endif
+ 
+@@ -35,10 +34,10 @@
+ bin_PROGRAMS = gsl-randist gsl-histogram
+ 
+ gsl_randist_SOURCES = gsl-randist.c
+-gsl_randist_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_randist_LDADD = libgsl.la
+ 
+ gsl_histogram_SOURCES = gsl-histogram.c
+-gsl_histogram_LDADD = libgsl.la cblas/libgslcblas.la
++gsl_histogram_LDADD = libgsl.la
+ 
+ check_SCRIPTS = test_gsl_histogram.sh pkgconfig.test
+ TESTS = test_gsl_histogram.sh pkgconfig.test
+@@ -57,6 +56,8 @@
+ 	-e 's|@GSL_CFLAGS[@]|$(GSL_CFLAGS)|g' \
+ 	-e 's|@GSL_LIBM[@]|$(GSL_LIBM)|g' \
+ 	-e 's|@GSL_LIBS[@]|$(GSL_LIBS)|g' \
++	-e 's|@CBLAS_CFLAGS[@]|$(CBLAS_CFLAGS)|g' \
++	-e 's|@CBLAS_LIBS[@]|$(CBLAS_LIBS)|g' \
+ 	-e 's|@LIBS[@]|$(LIBS)|g' \
+ 	-e 's|@VERSION[@]|$(VERSION)|g'
+ 
+--- gsl-1.16.orig/multifit/Makefile.am	2013-07-18 06:04:26.000000000 +1000
++++ gsl-1.16/multifit/Makefile.am	2013-11-22 16:57:26.170330257 +1100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la  ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+ 
+diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
+--- gsl-1.16.orig/multimin/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multimin/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS) 
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultimin.la ../min/libgslmin.la ../poly/libgslpoly.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ #demo_SOURCES = demo.c 
+-#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++#demo_LDADD = libgslmultimin.la ../min/libgslmin.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../linalg/libgsllinalg.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.16.orig/multiroots/Makefile.am gsl-1.16/multiroots/Makefile.am
+--- gsl-1.16.orig/multiroots/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/multiroots/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -15,5 +15,5 @@
+ TESTS = $(check_PROGRAMS)
+ 
+ test_SOURCES = test.c test_funcs.c test_funcs.h
+-test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslmultiroots.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../permutation/libgslpermutation.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+diff -Nur gsl-1.16.orig/ode-initval/Makefile.am gsl-1.16/ode-initval/Makefile.am
+--- gsl-1.16.orig/ode-initval/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/ode-initval/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -12,7 +12,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
++test_LDADD = libgslodeiv.la ../linalg/libgsllinalg.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la 
+ 
+ test_SOURCES = test.c
+ 
+diff -Nur gsl-1.16.orig/poly/Makefile.am gsl-1.16/poly/Makefile.am
+--- gsl-1.16.orig/poly/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/poly/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-check_PROGRAMS = test
++#check_PROGRAMS = test
+ 
+ test_SOURCES = test.c
+ test_LDADD = libgslpoly.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la ../sort/libgslsort.la
+diff -Nur gsl-1.16.orig/specfunc/Makefile.am gsl-1.16/specfunc/Makefile.am
+--- gsl-1.16.orig/specfunc/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/specfunc/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -12,7 +12,7 @@
+ 
+ check_PROGRAMS = test
+ 
+-test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslspecfunc.la ../eigen/libgsleigen.la ../linalg/libgsllinalg.la  ../sort/libgslsort.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test_sf.c test_sf.h test_airy.c test_bessel.c test_coulomb.c test_dilog.c test_gamma.c test_hyperg.c test_legendre.c test_mathieu.c
+   
+diff -Nur gsl-1.16.orig/wavelet/Makefile.am gsl-1.16/wavelet/Makefile.am
+--- gsl-1.16.orig/wavelet/Makefile.am	2013-07-17 13:04:26.000000000 -0700
++++ gsl-1.16/wavelet/Makefile.am	2013-08-19 15:25:27.729497736 -0700
+@@ -10,7 +10,7 @@
+ 
+ TESTS = $(check_PROGRAMS)
+ 
+-test_LDADD = libgslwavelet.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
++test_LDADD = libgslwavelet.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la  ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la ../utils/libutils.la
+ 
+ test_SOURCES = test.c
+ 
diff --git a/sci-libs/gsl/gsl-1.16-r1.ebuild b/sci-libs/gsl/gsl-1.16-r1.ebuild
new file mode 100644
index 0000000..d7cd4e1
--- /dev/null
+++ b/sci-libs/gsl/gsl-1.16-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.16.ebuild,v 1.1 2014/04/16 13:34:45 hasufell Exp $
+
+EAPI=5
+
+inherit multilib multilib-minimal eutils flag-o-matic autotools toolchain-funcs
+
+DESCRIPTION="The GNU Scientific Library"
+HOMEPAGE="http://www.gnu.org/software/gsl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cblas-external static-libs"
+
+RDEPEND="cblas-external? ( virtual/cblas )"
+DEPEND="${RDEPEND}
+	app-admin/eselect-cblas
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO )
+
+pkg_pretend() {
+	# prevent to use external cblas from a previously installed gsl
+	local current_lib
+	if use cblas-external; then
+		current_lib=$(eselect cblas show | cut -d' ' -f2)
+		if [[ ${current_lib} == gsl ]]; then
+			ewarn "USE flag cblas-external is set: linking gsl with an external cblas."
+			ewarn "However the current selected external cblas is gsl."
+			ewarn "Please install and/or eselect another cblas"
+			die "Circular gsl dependency"
+		fi
+	fi
+}
+
+src_prepare() {
+	ESELECT_PROF="gsl"
+
+	# bug 349005
+	[[ $(tc-getCC)$ == *gcc* ]] && \
+		[[ $(tc-getCC)$ != *apple* ]] && \
+		[[ $(gcc-major-version)$(gcc-minor-version) -eq 44 ]] \
+		&& filter-mfpmath sse
+	filter-flags -ffast-math
+
+	epatch "${FILESDIR}"/${P}-cblas.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.cblas.gsl "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.gsl || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.cblas.gsl || die
+	fi
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use cblas-external; then
+		export CBLAS_LIBS="$($(tc-getPKG_CONFIG) --libs cblas)"
+		export CBLAS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags cblas)"
+	fi
+	econf \
+		--enable-shared \
+		$(use_with cblas-external) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# take care of pkgconfig file for cblas implementation.
+	sed -e "s/@LIBDIR@/$(get_libdir)/" \
+		-e "s/@PV@/${PV}/" \
+		-e "/^prefix=/s:=:=${EPREFIX}:" \
+		-e "/^libdir=/s:=:=${EPREFIX}:" \
+		"${FILESDIR}"/cblas.pc.in > cblas.pc \
+		|| die "sed cblas.pc failed"
+	insinto /usr/$(get_libdir)/blas/gsl
+	doins cblas.pc || die "installing cblas.pc failed"
+	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.gsl \
+		${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=cblas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index f3ba8a0..3d7e55a 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,2 +1,3 @@
+EBUILD libdrm-9999-r1.ebuild 1668 SHA256 a5405c0050d4b7c6e8f886d4e4b7aa8eaa27e62497e4cb64c6217fe5b8a4d79e SHA512 7bd5fc0ae41c25d9b54a993e7f5660fded4eb6d518be55971f90bcf547af496a7bc43a0fa6ff46c9c3f6842ee86d53a19e8200ad51aab526cbd4be4bb6de35d8 WHIRLPOOL 25a50ba4f2630b8dcde8faf310ab79a743ab37103608ac3458c537f5277484d77127ab65f5afd92624e8d993cd1bea086a464eb5add2865256f06dddfad97f28
 EBUILD libdrm-9999.ebuild 1811 SHA256 2d592dd3467cdc21979b014652d25c19a3095a109a6a3a722da34b3b2b2ed68f SHA512 6f55f2a709d95d6e0a7a9ccf59ec0fd4aa0a8ae64ab5cb87b4953b7651242e9706f6903aeeda2b7873d756ab4026fadb8d6b8c95b14b6608ad20f27bb1a76287 WHIRLPOOL 7237c9f7ce8d642158baf5f72a121ad10b40ecf5a90f1173449d979711b1b37901aeaa30062ee2d88f199fc65933e76f0b250df82d0c158184061cb8ce735041
 MISC metadata.xml 272 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771 SHA512 c08dfcd90f1451c0cd9251b91833e8742e723043c2e6632eaab523d61745d0173502ae792225522053671df98aeaf2229783bfd5fe202bf29a166857fe0d8fd1 WHIRLPOOL f3d828a14266066ab3dd5c2970165bf9d1cf3d1c9fffd8d691344c7cc1b8ef011957d66f64b0c328afa64b92d1e154dec619f8f3bd0789edc36be07d33c74900
diff --git a/x11-libs/libdrm/libdrm-9999-r1.ebuild b/x11-libs/libdrm/libdrm-9999-r1.ebuild
new file mode 100644
index 0000000..ef56c9f
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-9999-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-udev
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno-experimental-api)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+	)
+	xorg-2_src_configure
+}