diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 335ddd5d9d977..4adfe12200e11 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,2 +1 @@
-DIST openscad-2013.06.src.tar.gz 4083085 SHA256 f277a8c3e6a548272f95279e50de6d4a6d73552775ab7a33c7f837c8e59173df SHA512 b0993c5a4517ebc13b88bc0167f9fc73d12a6a97938f0b6f6b1e5e436e1fb4704f6ff6a181c51f4cd0fb64c49493296d7172914ec5ae03c26a78da505a32edfc WHIRLPOOL 4a0366b0c6ae0aab91172af2c85a5ad785e5ad3526c3370350b813cda03fd3fb15d03a107e6d1f5e96c03fd6fbe9325f3b66c5c332d2bf0404bfde1eec8e48a1
-DIST openscad-2014.03.src.tar.gz 4417283 SHA256 865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 SHA512 32398f6d31109a77215972452740ac5612db34dc08613166f0c7e91ce117c0476c34a8282e9e1ba500bfbff56a60e81573605f2a7ca979b146686341c897e3f5 WHIRLPOOL 6caa2a74fb3f554b615f94576c481d9d309f74dc87a6d76e8d8d0b5577cc6b8a2b859f3ba044b191acf06228247988e43885d7344f76355f1c70264a5dc9c9e1
+DIST openscad-2015.03.src.tar.gz 12748351 SHA256 68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 SHA512 dadabe86c4897e1e074f67d7a94fb4a3813dd4e89997ec9106b343a4d015b88aef17c91b7b6351ef4ae08ff1da6cbb7ae92fcf89c271746a665e3422d4a3fe23 WHIRLPOOL 83540fc42d2b57d06a49030894f407d9eb68bdeec67e1028cb0f0bbe51d7872eab15103c25290a4243457e3f570a296fcb8a51efac9f28caf7b6c2d71d22f8d3
diff --git a/media-gfx/openscad/openscad-2013.06.ebuild b/media-gfx/openscad/openscad-2013.06.ebuild
deleted file mode 100644
index d840086f47d60..0000000000000
--- a/media-gfx/openscad/openscad-2013.06.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="https://openscad.googlecode.com/files/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-cpp/eigen:2
- dev-libs/gmp
- dev-libs/mpfr
- dev-libs/boost:=
- sys-libs/glibc
-"
-DEPEND="${CDEPEND} sys-devel/gcc"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
- #Use our CFLAGS (specifically don't force x86)
- sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro
-
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro
-}
diff --git a/media-gfx/openscad/openscad-2014.03.ebuild b/media-gfx/openscad/openscad-2015.03.ebuild
similarity index 89%
rename from media-gfx/openscad/openscad-2014.03.ebuild
rename to media-gfx/openscad/openscad-2015.03.ebuild
index edfdc55972db4..994c013c07d58 100644
--- a/media-gfx/openscad/openscad-2014.03.ebuild
+++ b/media-gfx/openscad/openscad-2015.03.ebuild
@@ -21,12 +21,12 @@ CDEPEND="media-gfx/opencsg
dev-qt/qtgui:4
dev-qt/qtopengl:4
dev-cpp/eigen:3
- dev-libs/gmp
- dev-libs/mpfr
+ dev-libs/gmp:0
+ dev-libs/mpfr:0
dev-libs/boost:=
- sys-libs/glibc
+ x11-libs/qscintilla
"
-DEPEND="${CDEPEND} sys-devel/gcc"
+DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}"
src_prepare() {
diff --git a/media-libs/libhdhomerun/Manifest b/media-libs/libhdhomerun/Manifest
index c8b91c47cae20..a3dd2025336af 100644
--- a/media-libs/libhdhomerun/Manifest
+++ b/media-libs/libhdhomerun/Manifest
@@ -1,3 +1,2 @@
-DIST libhdhomerun_20130117.tgz 41931 SHA256 80c8abb889b642339c6e30695ea1a0fcaaf48b76bdeaf3b29245297a42eb3141 SHA512 7065f6a0fd7bf67cc62e3b9462887594f7f9ad1617c13aa0f4d9fc7798600488a13179328fab9321be91f198873f961242064c3bb7b9567c63a8b0443d3c04c4 WHIRLPOOL 5fde51e79c6021fd8dc737415175f5ab89e95f23460d4b5e18dc5e2af04d8a7ac3c4ab06f82d27e46260843e13fd24dd2eec99f8711955a26259c4997ff528c5
-DIST libhdhomerun_20130328.tgz 41931 SHA256 66fdf3785f12bc4bcd4a9a6d322a1ad762bedff1a0888531b0ac5476491e4ed0 SHA512 3adbc34fd0aa8c045d491a85aa43f54e728de0b3959af6c675917fca46a66f2625511d879e8277060a5cefedccddc4e9352b2b6c1c70995352f4e6df4b6958cc WHIRLPOOL 0bd8dcbb0cbe64625967afb4592815bcede48fc953771d1e9d26ef380df9289121801e73e4c765dcd19b825c40ee4757b06eb42ad54f8cd39af29bb4664fd5c3
DIST libhdhomerun_20140121.tgz 47685 SHA256 a86308e7145c0cecb226ee913e7ce44258ef24fcba979d1f32dcff89022f9809 SHA512 bf7bfed024980b4a58d860b28194c6f3a394071ba1e3e25b46b2a20709e5de51fbb61779d46c9f1f01efd1553abf0332b3711afeb21479576f7f40da7f22eca1 WHIRLPOOL f5972c72a5e5eb708d4ada2eb0d09a409370c595ccd9da1d2b0f400e35c4ff41b828dd853116fe6c4c1ca725894423844e14dcf91e5c01d79454179b68c31014
+DIST libhdhomerun_20150826.tgz 49169 SHA256 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf SHA512 9b401c1649dc8c32ea9019b732631f9213cb66c43771aa148fa318202fc11739c005c474be6a77a6a7807818b5179f77debb5b2d2411d865cc87bb3d7ab629a6 WHIRLPOOL b069b5839821d55c5efaf28afbe174de3f32132dd5e4cd8ef348cba05bcc2ea4e436eb418c3323beb6816d82e046b76ace4c2a75d05fa3f61a6b7af9b09e5a8b
diff --git a/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild b/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild
deleted file mode 100644
index adbfffdf772bb..0000000000000
--- a/media-libs/libhdhomerun/libhdhomerun-20130117.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="SiliconDust HDHomeRun Utilties"
-HOMEPAGE="http://www.silicondust.com/support/hdhomerun/downloads/linux/"
-SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}/dont-strip.patch"
-}
-
-src_configure() {
- :
-}
-
-src_install() {
- dobin hdhomerun_config
- dolib libhdhomerun.so
-
- insinto /usr/include/hdhomerun
- doins *.h
-}
diff --git a/media-libs/libhdhomerun/libhdhomerun-20130328.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
similarity index 100%
rename from media-libs/libhdhomerun/libhdhomerun-20130328.ebuild
rename to media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
diff --git a/net-misc/netcf/Manifest b/net-misc/netcf/Manifest
deleted file mode 100644
index 54a3deb24b935..0000000000000
--- a/net-misc/netcf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST netcf-0.1.9.tar.gz 579227 RMD160 29bc4166c605cb1a7ee75c00429002c5603c359d SHA1 9cb91e94989215ad23a7c3b3f5c59fefaf0df261 SHA256 01a6ad0879a1140deaf7b46d3d38a852370bcdc6456c43f02e2db0715c2fb3bb
diff --git a/net-misc/netcf/metadata.xml b/net-misc/netcf/metadata.xml
deleted file mode 100644
index b2b86fc4d13db..0000000000000
--- a/net-misc/netcf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- cardoe@gentoo.org
- Doug Goldstein
- Anyone can take over this package if they
- want
-
-
-
diff --git a/net-misc/netcf/netcf-0.1.9.ebuild b/net-misc/netcf/netcf-0.1.9.ebuild
deleted file mode 100644
index 921e291a72661..0000000000000
--- a/net-misc/netcf/netcf-0.1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="netcf is a cross-platform network configuration library"
-HOMEPAGE="https://fedorahosted.org/netcf/"
-SRC_URI="https://fedorahosted.org/released/netcf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-admin/augeas-0.5.0
- dev-libs/libnl:1.1
- dev-libs/libxml2
- dev-libs/libxslt
- sys-libs/readline"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- # static libs are a waste of time and disk for this
- econf --disable-static
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die "install failed"
- dodoc AUTHORS ChangeLog README NEWS
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 01162fb94cb62..e9653ee26403b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -785,10 +785,6 @@ media-libs/shivavg
# not needed anymore for Asterisk 1.6.
net-misc/asterisk-spandsp_codec_g726
-# Doug Goldstein (07 Jul 2010)
-# No actual Gentoo support yet. If you're interested, please see bug #295993
-net-misc/netcf
-
# Mike Frysinger (07 Mar 2010)
# Very old packages that people should have upgraded away from
# long ago. Courtesy mask ... time to upgrade.