proj/gentoo: Initial commit

This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
author: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 13:49:04 -0700
committer: Robin H. Johnson <robbat2@gentoo.org> 2015-08-08 17:38:18 -0700
commit: 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree: 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-cdr
download: gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
275 files changed, 8702 insertions, 0 deletions
diff --git a/app-cdr/acetoneiso/Manifest b/app-cdr/acetoneiso/Manifest
new file mode 100644
index 000000000000..1a3a35c5e1a9
--- /dev/null
+++ b/app-cdr/acetoneiso/Manifest
@@ -0,0 +1 @@
+DIST acetoneiso_2.3.tar.gz 1376025 SHA256 ea1e6f285d23f08892ceb9ec336040b33b199fedf42881ef1374ca9f279a0768 SHA512 399c71647b7ab674fccdeae7300d3bd9fa3310e55828d499006999fd5b3e74d40a43e52f9cc99ad1fe1cf0e1edc1f76ca6db19b973ce38849abdff625863cf95 WHIRLPOOL b47c8df1c1b4f2309fbc3606bb88a21bf3c228c06f810ffcb15cdc884184dcd8b8c02931fd537851aadf3ee08541c437a1f3328198e7f70afb3fb1290cf7fd53
diff --git a/app-cdr/acetoneiso/acetoneiso-2.3.ebuild b/app-cdr/acetoneiso/acetoneiso-2.3.ebuild
new file mode 100644
index 000000000000..2870d9f4ba1c
--- /dev/null
+++ b/app-cdr/acetoneiso/acetoneiso-2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+MY_P=${PN}_${PV}
+
+inherit flag-o-matic qt4-r2
+
+DESCRIPTION="a feature-rich and complete software application to manage CD/DVD images"
+HOMEPAGE="http://sourceforge.net/projects/${PN}/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kde"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	kde? ( media-libs/phonon[qt4] )
+	!kde? ( || ( dev-qt/qtphonon:4 media-libs/phonon[qt4] ) )"
+RDEPEND="${DEPEND}
+	sys-fs/fuseiso"
+
+S=${WORKDIR}/${MY_P}/${PN}
+DOCS=(../AUTHORS ../CHANGELOG ../FEATURES ../README)
+
+src_prepare() {
+	sed -i -e 's:unrar-nonfree:unrar:g' sources/compress.h locale/*.ts || die
+	sed -i -e 's:include <Phonon/:include <:' sources/* || die "phonon sed failed"
+}
+
+src_configure() {
+	append-cxxflags -I/usr/include/KDE/Phonon
+
+	qt4-r2_src_configure
+}
diff --git a/app-cdr/acetoneiso/metadata.xml b/app-cdr/acetoneiso/metadata.xml
new file mode 100644
index 000000000000..9ead352eca21
--- /dev/null
+++ b/app-cdr/acetoneiso/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <upstream>
+    <remote-id type="sourceforge">acetoneiso</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
new file mode 100644
index 000000000000..de4b486415ae
--- /dev/null
+++ b/app-cdr/b5i2iso/Manifest
@@ -0,0 +1 @@
+DIST b5i2iso.tar.bz2 7503 SHA256 5fbf0522fa4c1e1c606ceb58c0711c5294ac4eb641ad5d8d599d7c2fe9999d31 SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4 WHIRLPOOL 9ad871dcaae09cbbee3bb255b1ac32043bad73e0df586c9141b7a8e098587a90576fed29c364f839735577caf60605c5a355bc774009ef962d3edc721abbcc00
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
new file mode 100644
index 000000000000..0b38ede8eb67
--- /dev/null
+++ b/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="BlindWrite image to ISO image file converter"
+HOMEPAGE="http://developer.berlios.de/projects/b5i2iso/"
+SRC_URI="mirror://berlios/${PN}/${PN}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN} || die
+}
diff --git a/app-cdr/b5i2iso/metadata.xml b/app-cdr/b5i2iso/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/b5i2iso/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/backlite/Manifest b/app-cdr/backlite/Manifest
new file mode 100644
index 000000000000..d4f47f7c9e9c
--- /dev/null
+++ b/app-cdr/backlite/Manifest
@@ -0,0 +1 @@
+DIST backlite-1.0.3.tar.gz 1597117 SHA256 f181667b585a26e7b44c2cd89e46ed00e4b0363542f2cfeb9ae2378d1718e5ca SHA512 6deb5cf33594da26a4ba1a4a01999feda10e8225b82c141df06eb958b559e5162be18b54a285ef34f4cf06af88dc635a4b2a27845a51a7fdecc96b94ac27f4c1 WHIRLPOOL b061a308443e226be9a1f479247e11baf0d14876b03bc87f8c7d39b0b42cc220725635f5433519f134c4e983401b4253a2ab66d5a952692b0499ef6082b3f5e7
diff --git a/app-cdr/backlite/backlite-1.0.3-r1.ebuild b/app-cdr/backlite/backlite-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..7120a7c3794d
--- /dev/null
+++ b/app-cdr/backlite/backlite-1.0.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qt4-r2 eutils
+
+DESCRIPTION="backlite is a pure QT4 version of k9copy"
+HOMEPAGE="http://k9copy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/k9copy/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="mplayer"
+
+# According to the author of backlite/k9copy libdvdread and libdvdnav are
+# bundled internal because newer versions produce bad DVD copies.
+# This will be fixed later.
+# DEPEND="media-libs/libdvdread"
+
+DEPEND=">=media-libs/libmpeg2-0.5.1
+	media-video/ffmpeg
+	dev-qt/qtgui:4
+	dev-qt/qtdbus:4
+	|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )"
+
+RDEPEND="${DEPEND}
+	media-video/dvdauthor
+	mplayer? ( media-video/mplayer )"
+
+src_prepare() {
+	sed -i -e '/^MimeTypes=.*/d' \
+		-e '/^Encoding=.*/d' *.desktop || die
+	epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch" \
+		"${FILESDIR}/${P}-includepaths.patch" \
+		"${FILESDIR}/${P}-ffmpeg2.patch"
+}
+
+src_configure() {
+	eqmake4 backlite.pro PREFIX="${D}"/usr
+}
+
+src_install() {
+	unset INSTALL_ROOT
+	default
+}
diff --git a/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..7feb3f9871da
--- /dev/null
+++ b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch
@@ -0,0 +1,363 @@
+From slackware:
+http://www.slackware.org.uk/slackbuilds.org/14.0/multimedia/backlite/
+https://bugs.gentoo.org/show_bug.cgi?id=443192
+
+diff -Nru backlite-1.0.3.orig/backlite.pro backlite-1.0.3/backlite.pro
+--- backlite-1.0.3.orig/backlite.pro	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/backlite.pro	2012-11-23 10:02:55.000000000 +0100
+@@ -386,6 +386,11 @@
+         INCLUDEPATH += $$a/ffmpeg
+ 	INCLUDEPATH += $$a/ffmpeg/libavformat
+     }
++    exists($$a/ffmpeg/libavutil) { 
++        message(found $$a/ffmpeg!)
++        INCLUDEPATH += $$a/ffmpeg
++	INCLUDEPATH += $$a/ffmpeg/libavutil
++    }
+     exists($$a/ffmpeg/libswscale) { 
+         message(found $$a/ffmpeg!)
+         INCLUDEPATH += $$a/ffmpeg
+@@ -400,6 +405,10 @@
+         message(found $$a/libavformat!)
+         INCLUDEPATH += $$a/libavformat
+     }
++    exists($$a/libavutil) { 
++        message(found $$a/libavutil!)
++        INCLUDEPATH += $$a/libavutil
++    }
+     exists($$a/libswscale) { 
+         message(found $$a/libswscale!)
+         INCLUDEPATH += $$a/libswscale
+diff -Nru backlite-1.0.3.orig/src/backup/k9mp4enc.cpp backlite-1.0.3/src/backup/k9mp4enc.cpp
+--- backlite-1.0.3.orig/src/backup/k9mp4enc.cpp	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/backup/k9mp4enc.cpp	2012-12-11 10:01:39.507859366 +0100
+@@ -619,7 +619,7 @@
+         //      cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
+     }
+     //synchronize audio
+-    cmd << "-async" << "1" ;
++    cmd << "-async" << "44100" ;
+     cmd << "-y"  << KShell::quoteArg(path);
+     cmd << slNewAudio;
+ //    if (m_extractMkv) {
+diff -Nru backlite-1.0.3.orig/src/core/k9audiocodecs.cpp backlite-1.0.3/src/core/k9audiocodecs.cpp
+--- backlite-1.0.3.orig/src/core/k9audiocodecs.cpp	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/core/k9audiocodecs.cpp	2012-12-11 10:01:39.510859330 +0100
+@@ -75,10 +75,10 @@
+     m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");
+     m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");
+     m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");
+-    m_codecs[7]=_k9AudioCodec("copy","-acodec copy","ffmpeg","");
+-    m_codecs[8]=_k9AudioCodec("mp3","-acodec libmp3lame -ab $AUDBRk -ac 2","ffmpeg",".mp3");
+-    m_codecs[9]=_k9AudioCodec("vorbis","-acodec vorbis -ab $AUDBRk -ac 2","ffmpeg",".ogg");
+-    m_codecs[10]=_k9AudioCodec("aac","-acodec libfaac -ab $AUDBRk -ac 2","ffmpeg",".aac");
++    m_codecs[7]=_k9AudioCodec("copy","-codec:a copy","ffmpeg","");
++    m_codecs[8]=_k9AudioCodec("mp3","-codec:a libmp3lame -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".mp3");
++    m_codecs[9]=_k9AudioCodec("vorbis","-codec:a vorbis -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".ogg");
++    m_codecs[10]=_k9AudioCodec("aac","-codec:a libfaac -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".aac");
+ 
+     save();
+ }
+diff -Nru backlite-1.0.3.orig/src/core/k9videocodecs.cpp backlite-1.0.3/src/core/k9videocodecs.cpp
+--- backlite-1.0.3.orig/src/core/k9videocodecs.cpp	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/core/k9videocodecs.cpp	2012-12-11 10:01:39.512859304 +0100
+@@ -98,12 +98,12 @@
+       m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+       m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+       m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+-      m_codecs[21]=_k9VideoCodec("copy","","-vcodec copy","-vcodec copy","-vcodec copy","ffmpeg");
+-      m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
+-      m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4  -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
++      m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
++      m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4  -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+ 
+       save();
+ 
+diff -Nru backlite-1.0.3.orig/src/import/k9avidecode.cpp backlite-1.0.3/src/import/k9avidecode.cpp
+--- backlite-1.0.3.orig/src/import/k9avidecode.cpp	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/import/k9avidecode.cpp	2012-11-23 09:39:06.000000000 +0100
+@@ -37,11 +37,13 @@
+         : QObject(parent) {
+     CodecHandle=0;
+     FormatHandle=0;
++    UtilHandle=0;
+     SwscaleHandle=0;
+     glibref=0;
+     if (glibref==0) {
+         CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
+         FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
++        UtilHandle=dlopen("libavutil.so",RTLD_LAZY);
+ #ifdef HAVE_SWSCALE
+         SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
+         if (SwscaleHandle==0)
+@@ -56,6 +58,12 @@
+     if (!FormatHandle ) {
+         errs << i18n("Cannot open the library %1").arg("libavformat");
+     }
++#   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++    if (!UtilHandle) {
++        m_error =i18n("Cannot open then library %1").arg("libavutil");
++        return;
++    }
++#   endif
+ #ifdef HAVE_SWSCALE
+     if (!SwscaleHandle) {
+         errs << i18n("Cannot open the library %1").arg("libswscale");
+@@ -63,17 +71,32 @@
+ #endif
+ 
+     av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
++#   else
+     av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
++#   else
+     av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
++#   endif
+     avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
++#   else
+     avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
++#   endif
+     avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
+     avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
+     av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
+     avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
+     av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
++#   else
+     avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
+-    if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
++#   endif
+ #ifndef HAVE_SWSCALE
+     img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
+ //if img_convert is null (deprecated in ffmpeg), we need libswscale
+@@ -85,7 +108,11 @@
+     if (av_free_packet==0)
+          av_free_packet=av_free_packet_internal;
+     avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
++#   else
+     av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
++#   endif
+     av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
+     av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
+     avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
+@@ -94,7 +121,11 @@
+     sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
+     sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
+ #endif
++#   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++    av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
++#   else
+     av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
++#   endif
+     
+     if (errs.count() >0) {
+         m_error=errs.join("\n");
+@@ -118,6 +149,8 @@
+         	dlclose(FormatHandle);
+ 	if (CodecHandle)
+         	dlclose(CodecHandle);
++    if(UtilHandle)
++            dlclose(UtilHandle);
+ #ifdef HAVE_SWSCALE
+ 	if (SwscaleHandle)
+         	dlclose(CodecHandle);
+@@ -134,12 +167,24 @@
+         close();
+ 
+     // Open video file
+-    if (av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0) {
++    if (
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++        avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), 0, 0)!=0
++#       else
++        av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
++#       endif
++       ) {
+         m_error=i18n("Couldn't open the file %1").arg(_fileName);
+         return false; // Couldn't open file}
+     }
+ // Retrieve stream information
+-    if (av_find_stream_info(m_FormatCtx)<0) {
++    if (
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++        avformat_find_stream_info(m_FormatCtx, NULL)<0
++#       else
++        av_find_stream_info(m_FormatCtx)<0
++#       endif
++       ) {
+         m_error =i18n("Couldn't find stream information");
+         return false; // Couldn't find stream information
+     }
+@@ -168,7 +213,13 @@
+         return false; // Codec not found
+     }
+ // Open codec
+-    if (avcodec_open(m_CodecCtx, m_Codec)<0) {
++    if (
++#       if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++        avcodec_open2(m_CodecCtx, m_Codec, NULL)<0
++#       else
++        avcodec_open(m_CodecCtx, m_Codec)<0
++#       endif
++       ) {
+         m_error =i18n("Could'nt open the codec");
+         return false; // Could not open codec
+     }
+@@ -245,15 +296,23 @@
+         // Is this a packet from the video stream?
+         if (packet.stream_index==m_videoStream) {
+             // Decode video frame
++#           if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++            avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, &packet);
++#           else
+             avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+                                  packet.data, packet.size);
++#           endif
+ 
+             // Did we get a video frame?
+             if (frameFinished) {
+ //            if (m_Frame->pts >=fspos)
+ 		int64_t cur_dts=fspos;
+-		if (m_FormatCtx->cur_st)
+-		    cur_dts=	m_FormatCtx->cur_st->cur_dts;
++#               if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
++		cur_dts=	packet.dts;
++#               else
++ 		if (m_FormatCtx->cur_st)
++ 		    cur_dts=	m_FormatCtx->cur_st->cur_dts;
++#               endif
+                 if (cur_dts >=fspos) {
+                     bFound=true;
+ #ifndef HAVE_SWSCALE
+@@ -309,7 +368,11 @@
+         avcodec_close(m_CodecCtx);
+ 
+         // Close the video file
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++        avformat_close_input(&m_FormatCtx);
++#       else
+         av_close_input_file(m_FormatCtx);
++#       endif
+         m_opened=false;
+     }
+ }
+diff -Nru backlite-1.0.3.orig/src/import/k9avidecode.h backlite-1.0.3/src/import/k9avidecode.h
+--- backlite-1.0.3.orig/src/import/k9avidecode.h	2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/import/k9avidecode.h	2012-11-23 09:39:06.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include "k9common.h"
+ #include <qobject.h>
+ #include <avformat.h>
++#include <avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+@@ -29,10 +30,22 @@
+ //typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
+ typedef void (*av_register_all_t) (void);
+ typedef int64_t (*av_gettime_t) (void);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
++#else
+ typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
++#endif
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
++#else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
++#endif
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
++#else
+ typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
++#endif
+ typedef AVFrame * (*avcodec_alloc_frame_t)(void);
+ 
+ typedef int (*avpicture_get_size_t)(int , int , int );
+@@ -40,11 +53,19 @@
+ typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
+ typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
++#else
+ typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
++#endif
+ typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
+ typedef void (*av_free_t)(void *);
+ typedef int (*avcodec_close_t)(AVCodecContext *);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++typedef void (*avformat_close_input_t)(AVFormatContext **);
++#else
+ typedef void (*av_close_input_file_t)(AVFormatContext *);
++#endif
+ typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); 		typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational )	;
+ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
+ typedef void (*av_free_packet_t)(AVPacket *);
+@@ -77,21 +98,41 @@
+ 	
+ private:
+     av_register_all_t av_register_all;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input_t avformat_open_input;
++#   else
+     av_open_input_file_t av_open_input_file;
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info_t avformat_find_stream_info;
++#   else
+     av_find_stream_info_t av_find_stream_info;
++#   endif
+     avcodec_find_decoder_t avcodec_find_decoder;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2_t avcodec_open2;
++#   else
+     avcodec_open_t avcodec_open;
++#   endif
+     avcodec_alloc_frame_t avcodec_alloc_frame;
+     av_seek_frame_t av_seek_frame;
+     avpicture_get_size_t avpicture_get_size;
+     av_malloc_t av_malloc;
+     avpicture_fill_t avpicture_fill;
+     av_read_frame_t av_read_frame;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2_t avcodec_decode_video2;
++#   else
+     avcodec_decode_video_t avcodec_decode_video;
++#   endif
+     img_convert_t img_convert;
+     av_free_t av_free;
+     avcodec_close_t avcodec_close;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input_t avformat_close_input;
++#   else
+     av_close_input_file_t av_close_input_file;
++#   endif
+     av_rescale_q_t av_rescale_q;
+     av_gettime_t av_gettime;
+     avcodec_flush_buffers_t avcodec_flush_buffers;
+@@ -103,6 +144,7 @@
+ #endif
+     void *CodecHandle;
+     void *FormatHandle;
++    void *UtilHandle;
+     void *SwscaleHandle;
+     int glibref;
+ 
diff --git a/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch
new file mode 100644
index 000000000000..63739350460b
--- /dev/null
+++ b/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=515160
+
+Index: backlite-1.0.3/src/import/k9avidecode.h
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.h
++++ backlite-1.0.3/src/import/k9avidecode.h
+@@ -40,7 +40,11 @@ typedef int (*avformat_find_stream_info_
+ #else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
+ #endif
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#else
++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
++#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
+ #else
diff --git a/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch b/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch
new file mode 100644
index 000000000000..bd9cdba6ffe3
--- /dev/null
+++ b/app-cdr/backlite/files/backlite-1.0.3-includepaths.patch
@@ -0,0 +1,89 @@
+libavutil/time.h in recent ffmpeg versions pollute the includes.
+include libav* headers correcly.
+
+Index: backlite-1.0.3/backlite.pro
+===================================================================
+--- backlite-1.0.3.orig/backlite.pro
++++ backlite-1.0.3/backlite.pro
+@@ -383,39 +383,31 @@ for(a, INCLOC ) {
+     exists($$a/ffmpeg/libavcodec) { 
+         message(found $$a/ffmpeg!)
+         INCLUDEPATH += $$a/ffmpeg
+-	INCLUDEPATH += $$a/ffmpeg/libavcodec
+     }
+     exists($$a/ffmpeg/libavformat) { 
+         message(found $$a/ffmpeg!)
+         INCLUDEPATH += $$a/ffmpeg
+-	INCLUDEPATH += $$a/ffmpeg/libavformat
+     }
+     exists($$a/ffmpeg/libavutil) { 
+         message(found $$a/ffmpeg!)
+         INCLUDEPATH += $$a/ffmpeg
+-	INCLUDEPATH += $$a/ffmpeg/libavutil
+     }
+     exists($$a/ffmpeg/libswscale) { 
+         message(found $$a/ffmpeg!)
+         INCLUDEPATH += $$a/ffmpeg
+-	INCLUDEPATH += $$a/ffmpeg/libswscale
+         DEFINES += HAVE_SWSCALE
+     }
+     exists($$a/libavcodec) { 
+         message(found $$a/libavcodec!)
+-        INCLUDEPATH += $$a/libavcodec
+     }
+     exists($$a/libavformat) { 
+         message(found $$a/libavformat!)
+-        INCLUDEPATH += $$a/libavformat
+     }
+     exists($$a/libavutil) { 
+         message(found $$a/libavutil!)
+-        INCLUDEPATH += $$a/libavutil
+     }
+     exists($$a/libswscale) { 
+         message(found $$a/libswscale!)
+-        INCLUDEPATH += $$a/libswscale
+         DEFINES += HAVE_SWSCALE
+     }
+ }
+Index: backlite-1.0.3/src/import/k9avidecode.cpp
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.cpp
++++ backlite-1.0.3/src/import/k9avidecode.cpp
+@@ -10,14 +10,14 @@
+ //
+ //
+ #include "k9avidecode.h"
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include <qimage.h>
+ #include <dlfcn.h>
+ #include "k9common.h"
+ 
+ #ifdef HAVE_SWSCALE
+ 
+-#include "swscale.h"
++#include <libswscale/swscale.h>
+ 
+ static int sws_flags = SWS_BICUBIC;
+ 
+Index: backlite-1.0.3/src/import/k9avidecode.h
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.h
++++ backlite-1.0.3/src/import/k9avidecode.h
+@@ -14,13 +14,13 @@
+ 
+ #include "k9common.h"
+ #include <qobject.h>
+-#include <avformat.h>
+-#include <avutil.h>
++#include <libavformat/avformat.h>
++#include <libavutil/avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+ #ifdef HAVE_SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ /**
+ 	@author Jean-Michel PETIT <k9copy@free.fr>
diff --git a/app-cdr/backlite/metadata.xml b/app-cdr/backlite/metadata.xml
new file mode 100644
index 000000000000..b6c0377a2637
--- /dev/null
+++ b/app-cdr/backlite/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<use>
+		<flag name="mplayer">Add support for mplayer preview in addition to X11
+		and phonon</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">k9copy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/bashburn/Manifest b/app-cdr/bashburn/Manifest
new file mode 100644
index 000000000000..08d28adc0d8c
--- /dev/null
+++ b/app-cdr/bashburn/Manifest
@@ -0,0 +1 @@
+DIST BashBurn-3.1.0.tar.gz 91295 SHA256 b78d5de1ee1b6e19aeee5b2f37a12aa6d02c665fd7645cad626ae7267351bb3c SHA512 9bded7a67b762be89993a6a7564d6a32f4cac209f9d16a4a861a5a36db92eda6436c2b80b89d57c051bbdafb0549999e54ce6e26477f664481cf60092eef90e5 WHIRLPOOL f21a3ea005c129f1df0bcda6d1a323934c2648620516d491539bbe17b99b8c97f5cd339fbc903a74450ba207941f7d3c3d0bde255eba0cffeb82df3c7665c9b6
diff --git a/app-cdr/bashburn/bashburn-3.1.0.ebuild b/app-cdr/bashburn/bashburn-3.1.0.ebuild
new file mode 100644
index 000000000000..4e9c800283d7
--- /dev/null
+++ b/app-cdr/bashburn/bashburn-3.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=BashBurn-${PV}
+
+DESCRIPTION="A shell script for burning optical media"
+HOMEPAGE="http://bashburn.dose.se/"
+SRC_URI="http://bashburn.dose.se/index.php?s=file_download&id=25 -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
+IUSE=""
+
+DEPEND="app-shells/bash"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	media-libs/flac
+	|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
+	media-sound/lame
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/normalize
+	media-sound/vorbis-tools
+	virtual/cdrtools
+	virtual/eject"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Fix for "warning: jobserver unavailable: using -j1."
+	sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
+}
+
+src_install() {
+	./Install.sh --prefix="${D}"/usr || die
+
+	# Remove /var/tmp/portage from installed script
+	sed -i \
+		-e "/BBROOTDIR=/s:'.*':'/usr/lib/Bashburn/lib':" \
+		"${ED}"/usr/lib/Bashburn/lib/BashBurn.sh || die
+
+	rm -rf "${ED}"/usr/lib/Bashburn/lib/docs
+	dodoc docs/{ChangeLog,CREDITS,FAQ,HOWTO,README,TODO,TRANSLATION_RULE}
+}
diff --git a/app-cdr/bashburn/metadata.xml b/app-cdr/bashburn/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/bashburn/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
new file mode 100644
index 000000000000..443ff2dd7a9e
--- /dev/null
+++ b/app-cdr/bchunk/Manifest
@@ -0,0 +1 @@
+DIST bchunk-1.2.0.tar.gz 15078 SHA256 afdc9d5e38bdd16f0b8b9d9d382b0faee0b1e0494446d686a08b256446f78b5d SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d WHIRLPOOL c6e1982cf731263edd8ab368100136d67b26600a2edd632153588a107bfae54fa5364c6816b40374adf2d7a112aaa138a016d3e46dbdedbdd392535da3fd8592
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r1.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..4da9feedbd41
--- /dev/null
+++ b/app-cdr/bchunk/bchunk-1.2.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts bin/cue CD-images to iso+wav/cdr"
+HOMEPAGE="http://he.fi/bchunk/"
+SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o bchunk bchunk.c || die
+}
+
+src_install() {
+	dobin bchunk || die
+	doman bchunk.1
+	dodoc ${P}.lsm README ChangeLog bchunk.spec
+}
diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml
new file mode 100644
index 000000000000..e32589f7217c
--- /dev/null
+++ b/app-cdr/bchunk/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>binchunker converts a CD image in a ".bin / .cue" format
+(sometimes ".raw / .cue") to a set of .iso and .cdr tracks.</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/bin2iso/Manifest b/app-cdr/bin2iso/Manifest
new file mode 100644
index 000000000000..e017fa680abe
--- /dev/null
+++ b/app-cdr/bin2iso/Manifest
@@ -0,0 +1 @@
+DIST bin2iso-19b.tar.bz2 9805 SHA256 450abbd1216f499d156172c4cdbd05722abd1d2150ef73d999e1caf19b433abf SHA512 1f2dbde824ee32eb3be878bf1b96167d753a3f40eb0baf59f3c72907dcc6ce4c999c04d008efde5269dec306b6eab3dd2b15a18a81388c105545abd04e1769c5 WHIRLPOOL b343f74acf40295eb759ac83bb3aea6b03999a04fe7a14deed6fd81b3cf4a4d33b0f65e10ae48be528ab953d3d158df6e98dfbfa6a906a0f5f11498f97b4a5fc
diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
new file mode 100644
index 000000000000..b1a7f22ac426
--- /dev/null
+++ b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format"
+HOMEPAGE="http://users.andara.com/~doiron/bin2iso/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	edos2unix *.c
+	epatch "${FILESDIR}"/${P}-sanity-checks.patch
+}
+
+src_compile() {
+	$(tc-getCC) bin2iso19b_linux.c -o ${PN} ${CFLAGS} ${LDFLAGS} || die "compile failed"
+}
+
+src_install() {
+	dobin ${PN} || die "dobin failed"
+	dodoc readme.txt
+}
diff --git a/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch b/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
new file mode 100644
index 000000000000..5803bc103a86
--- /dev/null
+++ b/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
@@ -0,0 +1,30 @@
+Add more checks to prevent segfaults in ill-formatted files
+
+http://bugs.gentoo.org/show_bug.cgi?id=90540
+
+--- bin2iso19b_linux.c
++++ bin2iso19b_linux.c
+@@ -237,6 +237,10 @@
+    // Get the 'mode'
+    if (strncmp(&Line[2], "TRACK ", 6)==0) 
+    {
++      if (Line[8] < '0' || Line[8] > '9' || Line[9] < '0' || Line[9] > '9') {
++        printf("Error: Track # is not a 2 digit number\n");
++        exit(1);
++      }
+       strncpy(track->num, &Line[8], 2); track->num[2] = '\0';
+ 
+       track->mode = UNKNOWN;
+@@ -246,7 +250,11 @@
+       if(strncmp(&Line[11], "MODE2/2352", 10)==0) track->mode = MODE2_2352;
+       if(strncmp(&Line[11], "MODE2/2336", 10)==0) track->mode = MODE2_2336;
+    }
+-   else return(1);
++   else
++   {
++      printf("Error: 2nd line does not begin with '  TRACK '\n");
++      exit(1);
++   }
+    
+    // Set the name
+    strcpy(track->name, sBinFilename);
diff --git a/app-cdr/bin2iso/metadata.xml b/app-cdr/bin2iso/metadata.xml
new file mode 100644
index 000000000000..0937d8ba0535
--- /dev/null
+++ b/app-cdr/bin2iso/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+Converts RAW format (.bin) files to ISO/WAV format and recovers .cue 
+files from .bin ones
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
new file mode 100644
index 000000000000..8bc336ab6a9d
--- /dev/null
+++ b/app-cdr/brasero/Manifest
@@ -0,0 +1,2 @@
+DIST brasero-3.12.0.tar.xz 3652832 SHA256 68fef2699b772fa262d855dac682100dbfea05563a7e4056eff8fe6447aec2fc SHA512 d8e40bc505d7bb77b1c74914895a8ccfd2a8773e5a86fe0d4ae2625710fc56a654cf125e7799d4bd1e4d38e1d8a255de3c9f028ce1b770c163dff2033fb662d2 WHIRLPOOL adc1d3d773679a1ca0b76031a8065d8e2d7447eb94db595bfbe5e33226b5f189166781b33718337f489baf9fbb9e1d0adc14410a0c2060aeeebe073020f82029
+DIST brasero-3.12.1.tar.xz 3683836 SHA256 9a5eea53e57b66de3c7c8c2393ac21a58d5afa81c6cfb16b3c7f010a3d147127 SHA512 c9a78b9bc627f4420f5cf70825aa8de6e42497e63e293a0382916c9cd1a2bb3ae0beb2b95b624b7203ab17dfd8c8bb10c18c16848079b82077663abe34674eda WHIRLPOOL d7a5cd528d2c7ab37c5adeaf894646c989a29d806f6384e3a3cbcc6044785905f80907b9dec32e8228ade8558c227fe6ecbccf4bc0871e6d7a1581300a0e0550
diff --git a/app-cdr/brasero/brasero-3.12.0.ebuild b/app-cdr/brasero/brasero-3.12.0.ebuild
new file mode 100644
index 000000000000..86eeaf1a3949
--- /dev/null
+++ b/app-cdr/brasero/brasero-3.12.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1:=
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	libburn? (
+		>=dev-libs/libburn-0.4:=
+		>=dev-libs/libisofs-0.6.4:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( >=app-misc/tracker-0.12:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.3 )
+"
+# eautoreconf deps
+#	app-text/yelp-tools
+#	gnome-base/gnome-common
+
+PDEPEND="gnome-base/gvfs"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search) \
+		ITSTOOL=$(type -P true)
+}
diff --git a/app-cdr/brasero/brasero-3.12.1.ebuild b/app-cdr/brasero/brasero-3.12.1.ebuild
new file mode 100644
index 000000000000..a3bf45af556b
--- /dev/null
+++ b/app-cdr/brasero/brasero-3.12.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gtk+-3:3[introspection?]
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/libnotify-0.6.1:=
+
+	media-libs/libcanberra[gtk3]
+	x11-libs/libICE
+	x11-libs/libSM
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
+	libburn? (
+		>=dev-libs/libburn-0.4:=
+		>=dev-libs/libisofs-0.6.4:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.90 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( >=app-misc/tracker-0.12:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-meta:1.0
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	>=dev-util/gtk-doc-am-1.12
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( app-text/docbook-xml-dtd:4.3 )
+"
+# eautoreconf deps
+#	app-text/yelp-tools
+#	gnome-base/gnome-common
+
+PDEPEND="gnome-base/gvfs"
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search) \
+		ITSTOOL=$(type -P true)
+}
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
new file mode 100644
index 000000000000..de61cac68a76
--- /dev/null
+++ b/app-cdr/brasero/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnome</herd>
+	<herd>media-optical</herd>
+	<use>
+		<flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+		<flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
+			extension</flag>
+		<flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag>
+		<flag name="playlist">Enable support for playlists through
+			<pkg>dev-libs/totem-pl-parser</pkg></flag>
+		<flag name="tracker">Enable audio playlist search using the
+			<pkg>app-misc/tracker</pkg> indexer</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-cdr/burn-cd/Manifest b/app-cdr/burn-cd/Manifest
new file mode 100644
index 000000000000..c28ca4cbf31c
--- /dev/null
+++ b/app-cdr/burn-cd/Manifest
@@ -0,0 +1,2 @@
+DIST burn-cd-1.7.4.gz 14618 SHA256 2b86395358adf96a5b0b60c8869f1d2e62e6c7d43c9d6eabd64899c9f2ef2f66 SHA512 21009659342b284654cec17ac597a5d8f7421a3c0112937db1b70563a42f00a781a7156eeb3877d9c23d6338cffa525cf2f25e4191d9444cca72c4821c9690d6 WHIRLPOOL af2bf7f9832676fe9f508828445d4e41586caee14ff90ce8d50a9e9ac16a0a71290002d5eb92140b2430729700021ee507e72b9a615832840144cc7908230be4
+DIST burn-cd-1.8.0.gz 14977 SHA256 89b01f1c736ffa494aa3d089516db479e0567c5f3784c96df5ce87a4880bbf75 SHA512 d052d6bd909af3f3c96cee727e222e179d913aa42c2d2afe8104c57b5263b06f318d6ec870ad2862779d757c4d522b7d82892eb0725255261a28243c919b82cf WHIRLPOOL 6a08964511a5a27803d6941971b923e8b73a90cfee7d137d529c313815b2ed911f0a2e4478b2272c465fd96421d83c9f5db1b6cbc81f6c9272c31aebfb287019
diff --git a/app-cdr/burn-cd/burn-cd-1.7.4.ebuild b/app-cdr/burn-cd/burn-cd-1.7.4.ebuild
new file mode 100644
index 000000000000..e2cc44ec546a
--- /dev/null
+++ b/app-cdr/burn-cd/burn-cd-1.7.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Smart console frontend for virtual/cdrtools and dvd+rw-tools"
+HOMEPAGE="http://burn-cd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-lang/python
+	virtual/cdrtools
+	app-cdr/dvd+rw-tools"
+DEPEND=""
+
+src_install() {
+	newbin ${P} ${PN} || die "newbin failed."
+}
diff --git a/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild b/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..15579094da7f
--- /dev/null
+++ b/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Smart console frontend for virtual/cdrtools and dvd+rw-tools"
+HOMEPAGE="http://burn-cd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	virtual/cdrtools
+	app-cdr/dvd+rw-tools"
+DEPEND=""
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_install() {
+	python_fix_shebang ${P}
+	newbin ${P} ${PN}
+}
diff --git a/app-cdr/burn-cd/metadata.xml b/app-cdr/burn-cd/metadata.xml
new file mode 100644
index 000000000000..e44077c4cb8e
--- /dev/null
+++ b/app-cdr/burn-cd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">burn-cd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
new file mode 100644
index 000000000000..9e7d02c138ab
--- /dev/null
+++ b/app-cdr/burncdda/Manifest
@@ -0,0 +1 @@
+DIST burncdda-1.8.0.tar.gz 23795 SHA256 cd0caf43040e70ccd15df7377feeed667487e2dfa125858843898fcb462b6299 SHA512 798d2f6c51005dc87d1214e82cc5b2227bdf34b93b0457382cb0eb86a1426be9e61df5029460b42842cb730b806934447f6adb9ed7e6674e69d4910799b3ee92 WHIRLPOOL c07dd54c367b9ef27b738dbe655390eef74b0af835281b5c89c1cd41a8a7fb9d3a766f63a18e255930fc2a25237706852f462b301a662e108a05eeb10ee49f43
diff --git a/app-cdr/burncdda/burncdda-1.8.0.ebuild b/app-cdr/burncdda/burncdda-1.8.0.ebuild
new file mode 100644
index 000000000000..218f93287abd
--- /dev/null
+++ b/app-cdr/burncdda/burncdda-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Console app for copying burning audio cds"
+HOMEPAGE="http://www.thenktor.homepage.t-online.de/burncdda"
+SRC_URI="http://www.thenktor.homepage.t-online.de/burncdda/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE="flac mp3 vorbis"
+
+DEPEND="dev-util/dialog
+	app-cdr/cdrdao
+	virtual/cdrtools
+	mp3? ( media-sound/mpg123
+		media-sound/mp3_check )
+	vorbis? ( media-sound/vorbis-tools )
+	flac? ( media-libs/flac )
+	media-sound/normalize
+	media-sound/sox"
+
+src_install() {
+	dobin ${PN} || die "dobin failed."
+
+	insinto /usr/lib/${PN}
+	doins *.func || die "doins failed."
+
+	insinto /etc
+	doins ${PN}.conf || die "doins failed."
+
+	dodoc CHANGELOG
+	doman burncdda.1.gz
+}
diff --git a/app-cdr/burncdda/metadata.xml b/app-cdr/burncdda/metadata.xml
new file mode 100644
index 000000000000..b8ea64ff3beb
--- /dev/null
+++ b/app-cdr/burncdda/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+	burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec,
+	flac, normalize, and mp3_check. It can be used to create audio CDs from an
+	M3U playlist (the playlist format of XMMS and amaroK). It supports MP3, OGG
+	Vorbis, Musepack, FLAC, and WAV files, and it might be the easiest way to
+	copy an audio CD.
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/burncenter/Manifest b/app-cdr/burncenter/Manifest
new file mode 100644
index 000000000000..e4375bbb3acf
--- /dev/null
+++ b/app-cdr/burncenter/Manifest
@@ -0,0 +1 @@
+DIST burncenter-3.2.1.tar.gz 15630 SHA256 87d784db99c3e9eb4d3e5b5612d81116e035a348680f22263c0db65fe10ba20a SHA512 61c5c8f520acba1138bb039127439e7919e9d8dc77e39bb547e0fb6d25b595cfd23cca77b0040293ced494d13f02a1cf12fb3be97ae1ed7b73b7b22fd1ed2cce WHIRLPOOL 9dd968ae85af99879471a5fd8a19248e66f193c635843a6c42af961cd807a87281df6ab83dfd1f81397c3c30199c19e00824deebd6c0096f572d73f8f6f40f7f
diff --git a/app-cdr/burncenter/burncenter-3.2.1.ebuild b/app-cdr/burncenter/burncenter-3.2.1.ebuild
new file mode 100644
index 000000000000..c93b43073859
--- /dev/null
+++ b/app-cdr/burncenter/burncenter-3.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A Perl module and a collection of easy-to-use text based interfaces to the UNIX CD burning tools"
+HOMEPAGE="http://alx14.free.fr/burncenter/"
+SRC_URI="http://alx14.free.fr/burncenter/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="vorbis"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	media-sound/mpg123
+	vorbis? (
+		>=media-sound/vorbis-tools-1.0_rc2
+		>=media-sound/oggtst-0.0 )"
+
+src_compile() {
+	# Nothing to do.
+	true
+}
+
+src_install() {
+	local modulePath=$(perl -V:installprivlib | perl -p -e "s/^.*?='(.*?)';/\$1/")
+	dobin burncenter
+	dobin bcbatch
+	insinto ${modulePath}
+	doins Burncenter.pm
+
+	dodoc DEVELOP-FRONTENDS README TODO
+}
diff --git a/app-cdr/burncenter/metadata.xml b/app-cdr/burncenter/metadata.xml
new file mode 100644
index 000000000000..39c34fb79ef0
--- /dev/null
+++ b/app-cdr/burncenter/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+	 Burncenter is a very easy-to-use text-based interface to cd-burning tools
+	 under UNIX (cdrecord, cdda2wav, mkisofs). Burncenter 3.x is a Perl module
+	 (Burncenter.pm) and a collection of frontends for this module.
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/ccd2iso/Manifest b/app-cdr/ccd2iso/Manifest
new file mode 100644
index 000000000000..2627cb4f3a68
--- /dev/null
+++ b/app-cdr/ccd2iso/Manifest
@@ -0,0 +1 @@
+DIST ccd2iso-0.3.tar.gz 158221 SHA256 f874b8fe26112db2cdb016d54a9f69cf286387fbd0c8a55882225f78e20700fc SHA512 40e0e5bd792c851dd0549a08a3a0d7226cc05893316dc9575d4c9131dce758d992081355de569e3e66dca310545bf3a17c1cd6431ab97e790fdbe5b19c09adc1 WHIRLPOOL 315b2063a4d1075da6cf95b0a7a3ce1fbb5e6737ccdf1a622ebe9640a93239233a671f55c1710218b33a41a44827263fd4286bc2a4c7a3d134008d508af67324
diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
new file mode 100644
index 000000000000..0169a3a1dd03
--- /dev/null
+++ b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Converts CloneCD images (popular under Windows) to ISOs"
+HOMEPAGE="http://sourceforge.net/projects/ccd2iso/"
+SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-headers.patch
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch b/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
new file mode 100644
index 000000000000..2f907123e26b
--- /dev/null
+++ b/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
@@ -0,0 +1,10 @@
+--- src/ccd2iso.c.orig	2007-04-01 03:00:14.000000000 -0400
++++ src/ccd2iso.c	2007-04-01 03:00:57.000000000 -0400
+@@ -27,6 +27,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "clonecd.h"
+ 
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
new file mode 100644
index 000000000000..8ef18cc24d1e
--- /dev/null
+++ b/app-cdr/ccd2iso/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription>
+CloneCD image to ISO image file converter
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ccd2iso</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/cdck/Manifest b/app-cdr/cdck/Manifest
new file mode 100644
index 000000000000..c845223c390f
--- /dev/null
+++ b/app-cdr/cdck/Manifest
@@ -0,0 +1 @@
+DIST cdck-0.7.0.tar.gz 240285 SHA256 cb817ef2e8ab37d499d3630264901b9d22ebe67345507acd364f8f1e3995b404 SHA512 aa53a2270fdf4f7d9b61bfe5b4a876ea63baad18b7cc7c920049b446f5518aee3c8389a9c5990bd96ce7e641222d39a70da86e2c6235bb68f054c576ddbc3730 WHIRLPOOL e1e147714459191c9a7c5be7b317b3f125922c90d0cc05ac92828a203b34ab7738a2694e61f96dbb28f97e67fd62be881922e4fd85dbfeb5d9bb4c2f638faaca
diff --git a/app-cdr/cdck/cdck-0.7.0-r1.ebuild b/app-cdr/cdck/cdck-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..a870b32b2b6a
--- /dev/null
+++ b/app-cdr/cdck/cdck-0.7.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality"
+HOMEPAGE="http://swaj.net/unix/index.html#cdck"
+SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -e '1d' -i man/cdck_man.in || die "sed failed"
+}
+
+src_configure() {
+	econf --disable-dependency-tracking \
+		--disable-shared || die "econf failed."
+}
+
+src_compile() {
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	dobin src/cdck || die "dobin failed."
+	doman man/cdck.1
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml
new file mode 100644
index 000000000000..33e32af6ee6b
--- /dev/null
+++ b/app-cdr/cdck/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <maintainer>
+    <email>zzam@gentoo.org</email>
+    <name>Matthias Schwarzott</name>
+  </maintainer>
+  <longdescription>
+    Actually cdck is a simple program to verify CD/DVD quality. The known
+    fact is that even if all files on the disc are readable, some sectors
+    having bad timing can easily turn into unreadable ones in the future.
+
+    To get an idea about disc cdck reads it sector by sector, keeping all
+    reading timings and then tells you its verdict. Optionally it can write
+    timing table into text file usable by gnuplot(1) program, so you can draw
+    some graphs out of it.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-cdr/cdcover/Manifest b/app-cdr/cdcover/Manifest
new file mode 100644
index 000000000000..c4aa5259ae2d
--- /dev/null
+++ b/app-cdr/cdcover/Manifest
@@ -0,0 +1 @@
+DIST cdcover-0.7.4.tar.gz 908267 SHA256 f93d8cd2b85f21872e18f61f22522ff56ab70d627ae45cf970d689166327a6c0 SHA512 5da176559595608ac6565d23a390364b0fff332084206e819f91d22baee86a752677424fdf90e6a6ecf85fa30eab00edc89fb419f3ae82e0fcce0e714dbb1985 WHIRLPOOL 301937cc10a0f961d8dfe83edd0c7a8febdbf8f56757501b9cdeec36ca24776287820581e08f5a6d0d0e50f1209984b688d46872279a009e26c4527e283c2628
diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..a4f9d063882f
--- /dev/null
+++ b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE=tk
+
+inherit eutils python-single-r1
+
+DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
+HOMEPAGE="http://cdcover.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb"
+
+RDEPEND="${PYTHON_DEPS}
+	cddb? ( dev-python/cddb-py[${PYTHON_USEDEP}] )
+	media-sound/cd-discid"
+DEPEND=""
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
+}
+
+src_compile() {
+	emake prefix="${D}"/usr target=/usr || die
+}
+
+src_install() {
+	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
+
+	python_fix_shebang "${D}"
+
+	make_desktop_entry ${PN} ${PN}
+
+	dodoc doc/cdcover.pdf
+}
diff --git a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
new file mode 100644
index 000000000000..c1026bf23503
--- /dev/null
+++ b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
@@ -0,0 +1,13 @@
+--- Makefile
++++ Makefile
+@@ -9,8 +9,8 @@
+ IMAGES=./share/images
+ TEMPLATES=./share/templates
+ 
+-DOCFILES=BUGS COPYING INSTALL README VERSION
+-IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
++DOCFILES=README VERSION
++IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
+ TEMPLATEFILES=CD-Classic.pst CD-Modern.pst CD-Tracktime.pst CD-TwoColumns.pst DVD-Classic.pst
+ 
+ INSTALL=install -D
diff --git a/app-cdr/cdcover/metadata.xml b/app-cdr/cdcover/metadata.xml
new file mode 100644
index 000000000000..0b02723d0fa8
--- /dev/null
+++ b/app-cdr/cdcover/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">cdcover</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/cddetect/Manifest b/app-cdr/cddetect/Manifest
new file mode 100644
index 000000000000..38f8de4a524a
--- /dev/null
+++ b/app-cdr/cddetect/Manifest
@@ -0,0 +1 @@
+DIST cddetect-2.1.tar.gz 11779 SHA256 ddf44070cd146bcd859f6cf2b98d43420959bd4145b7f94cfba4203859911133 SHA512 1a67a17f1d26db8361fd72201afa108571fe8639d34e0bea6fd47a26ea6dfa9ff535c56fd14739d9ee551efdcf74c261e6e4b208e769d066926ee96c400ed54c WHIRLPOOL 7f401420286b78ec940079a5c241d837565a16e9819b3738544800c56430acfb266059b7d7b6df2a03c67d91bd1e0ce6f48fe3dc7424e978d06432d41ced2e6f
diff --git a/app-cdr/cddetect/cddetect-2.1.ebuild b/app-cdr/cddetect/cddetect-2.1.ebuild
new file mode 100644
index 000000000000..842c0fa5095f
--- /dev/null
+++ b/app-cdr/cddetect/cddetect-2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for detecting the type of a CD/DVD without mounting it"
+HOMEPAGE="http://www.bellut.net/projects.html"
+SRC_URI="http://www.bellut.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	sed -i -e '1i#include <limits.h>' ${PN}.c || die #337628
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="-Wall ${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-cdr/cddetect/metadata.xml b/app-cdr/cddetect/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/cddetect/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
new file mode 100644
index 000000000000..8a91513c5ba7
--- /dev/null
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -0,0 +1,2 @@
+DIST cdemu-daemon-2.1.1.tar.bz2 62600 SHA256 d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f SHA512 be59bf12e326855ccdfe5cec72a813b7a80dcc2cb408c3f19b9abe66eeb8d092e2755b1ba9f746ac7d3c1b27276ed857947ce1b2509d8cbf07eb1c6663f3536d WHIRLPOOL fd6ad9aa28ae9c821934099a3be271a1fe85db684dcc1ca9b65d499281ce65b27ac63d44c8570309d1fc3fbd486eadb165e15cec285c81bb07b10c709a1f6f42
+DIST cdemu-daemon-3.0.2.tar.bz2 76029 SHA256 8c9a0d292e0fd71538f123f2b795f4490ff455f68b391b97812be369c34a4f06 SHA512 eb09880dcc984c8843cf0254d45aeaa39cff8faa3a415352c574b59ea6778de9bc10a9634022c1fe5c7de8aa0493129a7bd15b859a7ca3895d5175b2bb2296e1 WHIRLPOOL 918554fead811418bd1e1b1ad8cd22342c5e5559eb7e4f3e30f1ccb1c889547bbd7f70bd7af86c19af86a7c432281f3d98a2fb5d0ef59f57dcddf3ad0fc10686
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
new file mode 100644
index 000000000000..7b2e7b8faf2e
--- /dev/null
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/6" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
+KEYWORDS="amd64 ~hppa x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	>=dev-libs/libmirage-${PV}:=
+	<dev-libs/libmirage-3
+	>=media-libs/libao-0.8.0:=
+	sys-apps/dbus
+	>=sys-fs/vhba-20130607"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	DOCS="AUTHORS README"
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	elog "You will need to load the vhba module to use cdemu devices:"
+	elog " # modprobe vhba"
+	elog "To automatically load the vhba module at boot time, edit your"
+	elog "/etc/conf.d/modules file."
+
+	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
+		elog
+		elog "${PN} no longer installs an init.d service; instead, it is"
+		elog "automatically activated when needed via dbus."
+		elog "You can therefore remove ${ROOT}etc/conf.d/cdemud"
+	fi
+}
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.0.2.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.0.2.ebuild
new file mode 100644
index 000000000000..c31fa7c98c68
--- /dev/null
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
+KEYWORDS="amd64 ~hppa x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	>=dev-libs/libmirage-${PV}:=
+	>=media-libs/libao-0.8.0:=
+	sys-apps/dbus
+	>=sys-fs/vhba-20130607"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	DOCS="AUTHORS README"
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	elog "You will need to load the vhba module to use cdemu devices:"
+	elog " # modprobe vhba"
+	elog "To automatically load the vhba module at boot time, edit your"
+	elog "/etc/conf.d/modules file."
+
+	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
+		elog
+		elog "${PN} no longer installs an init.d service; instead, it is"
+		elog "automatically activated when needed via dbus."
+		elog "You can therefore remove ${ROOT}etc/conf.d/cdemud"
+	fi
+}
diff --git a/app-cdr/cdemu-daemon/metadata.xml b/app-cdr/cdemu-daemon/metadata.xml
new file mode 100644
index 000000000000..e56b6a0cf661
--- /dev/null
+++ b/app-cdr/cdemu-daemon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
new file mode 100644
index 000000000000..9089ee8863a8
--- /dev/null
+++ b/app-cdr/cdemu/Manifest
@@ -0,0 +1,2 @@
+DIST cdemu-client-2.1.1.tar.bz2 28474 SHA256 204e626994f61d36423f3b732e180e3b3b20624effdfe91aabffd439c76d3964 SHA512 d764000fadc66b639dd8f20d9bb8fbe3b91d3e20bd207d30a734dc1a9a7fae746e8aad317a3d78cd35b69d0a8acbf8e389598786cadabec6e512640ba5b21be5 WHIRLPOOL 93cb01c3bc16ee69e3fd9ce9080838f4eebc874afe8d6be71c22e44919909144980dd44595a0dbf6fe1add3574061bcd6f523b72644eb52774d974f226c100b9
+DIST cdemu-client-3.0.0.tar.bz2 40300 SHA256 359310a57422d5c59c8f93be0da827a2437edb1e62f455f5614089c28e34ae88 SHA512 807fe98dc8743a227484d20587c9f9e06cac649d74d8fdd520dba9bb2a2f268ba977c922333fdcf91201baf4f08595044939f6d5bd4834ec26cf689b6a36f361 WHIRLPOOL bd7d5b0ebe75aad5629f8cdf9f1de04fbdf7ad37400163d69e1eb9bfe35a47bc2bca5b58a031bb022611689d7c7c480fcc98403f883643ccc3cc2049f98fb814
diff --git a/app-cdr/cdemu/cdemu-2.1.1.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild
new file mode 100644
index 000000000000..86ea5fa4965c
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-2.1.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="de fr no pl sl sv"
+
+inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/6 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/cdemu
+	epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch"
+	# build system doesn't respect LINGUAS :/
+	l10n_find_plocales_changes po "" ".po"
+	rm_po() {
+		rm po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/cdemu/cdemu-3.0.0.ebuild b/app-cdr/cdemu/cdemu-3.0.0.ebuild
new file mode 100644
index 000000000000..bb3dcb42a2b9
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-3.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="no sl sv"
+
+inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/cdemu
+	epatch "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch"
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Build system doesn't respect LINGUAS, and changing list of installed
+	# translations requires error-prone editing of CMakeLists.txt
+	rm_po() {
+		rm -r "${ED}"/usr/share/locale/$1 || die
+		ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
new file mode 100644
index 000000000000..a4b26f2608c6
--- /dev/null
+++ b/app-cdr/cdemu/files/cdemu-2.1.0-bash-completion-dir.patch
@@ -0,0 +1,15 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 6f33b7c..3c61daa 100644
+--- a/cdemu-client/CMakeLists.txt
++++ b/cdemu-client/CMakeLists.txt
+@@ -41,8 +41,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bashcomp
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
+-    RENAME cdemu-client
++    DESTINATION ${GENTOO_BASHCOMPDIR}
++    RENAME cdemu
+ )
+ 
+ intltool_merge ("-d" po data/cdemu-client.desktop.in cdemu-client.desktop)
diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
new file mode 100644
index 000000000000..54d11dab4d1b
--- /dev/null
+++ b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 99b595e..e4f9b6e 100644
+--- a/cdemu-client/CMakeLists.txt
++++ b/cdemu-client/CMakeLists.txt
+@@ -39,7 +39,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bash-completion.sh
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++    DESTINATION ${GENTOO_BASHCOMPDIR}
++    RENAME cdemu
+ )
+ 
+ install (
diff --git a/app-cdr/cdemu/metadata.xml b/app-cdr/cdemu/metadata.xml
new file mode 100644
index 000000000000..f9c962bbe7e4
--- /dev/null
+++ b/app-cdr/cdemu/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>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <use>
+    <flag name="cdemu-daemon">Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
new file mode 100644
index 000000000000..b8258b5a0fd5
--- /dev/null
+++ b/app-cdr/cdlabelgen/Manifest
@@ -0,0 +1,2 @@
+DIST cdlabelgen-4.0.0.tgz 191251 SHA256 ead5392a4310b8f7a3b6ff36a9d9934563dcd354f12d4b25e70f17644c2dd393 SHA512 a1b92f3c3f3b012003f42eaea111fc7802098833937459e6287cc98aa9b4338ee1cb2e10e3e6c821e7edbd1ab57bb22ec2f644c8e2fe9a152788374507876c9b WHIRLPOOL acbb42904c0037e8e6df90bd01e2baee3f3a3228c16f440799c4abe6f46581bc648e7f55a80d35382b24d8acd12a30b96731596023fc4a4d5aad79792b073a2c
+DIST cdlabelgen-4.1.0.tgz 193423 SHA256 d3217af8eccb8e94863389d321c4901e7cf7dd5fadf263bde9cb8078870ddc3b SHA512 12dbef9df24d6eb060fe0fca3d24cd91bf2ae0fe4f2e68d1e7a78b5980ae0111dd087ec23b6b2ff8adeff9bb49c0a41284dcb99505d6f25b96b0e718b437b1b9 WHIRLPOOL 26a1614cb0104dcd78ae6f75810eaa6f83eec22f6848470849e1d0e988c5d919715a42208b05ee47dfeac2ffdbe37631637ad96aef2e845aa25817864c4c3570
diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild
new file mode 100644
index 000000000000..753c07f41f52
--- /dev/null
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="CD cover, tray card and envelope generator"
+HOMEPAGE="http://www.aczoom.com/tools/cdinsert"
+SRC_URI="http://www.aczoom.com/pub/tools/${P}.tgz"
+LICENSE="aczoom"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PV}-create-MAN_DIR.diff
+}
+
+src_install() {
+	emake install BASE_DIR="${D}"/usr || die "emake failed"
+	dodoc ChangeLog README INSTALL.WEB cdinsert.pl || die "dodoc failed."
+	dohtml *.html || die "dohtml failed."
+}
diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild
new file mode 100644
index 000000000000..902f7f370ada
--- /dev/null
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="CD cover, tray card and envelope generator"
+HOMEPAGE="http://www.aczoom.com/tools/cdinsert"
+SRC_URI="http://www.aczoom.com/pub/tools/${P}.tgz"
+
+LICENSE="aczoom"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/4.0.0-create-MAN_DIR.diff
+}
+
+src_install() {
+	emake BASE_DIR="${D}"/usr install || die "emake install failed"
+	dodoc cdinsert.pl ChangeLog INSTALL.WEB
+	dohtml *.html
+}
diff --git a/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff b/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
new file mode 100644
index 000000000000..54191b2dddd3
--- /dev/null
+++ b/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
@@ -0,0 +1,18 @@
+diff -Naur cdlabelgen-4.0.0.orig/Makefile cdlabelgen-4.0.0/Makefile
+--- cdlabelgen-4.0.0.orig/Makefile	2007-12-16 16:17:22.000000000 +0100
++++ cdlabelgen-4.0.0/Makefile	2007-12-16 16:18:10.000000000 +0100
+@@ -45,13 +45,13 @@
+ 	@echo ""
+ 	$(INSTALL_DIR) $(BIN_DIR)
+ 	$(INSTALL) cdlabelgen $(BIN_DIR)
++	$(INSTALL_DIR) $(MAN_DIR)/man1
+ 	$(INSTALL_FILE) cdlabelgen.1 $(MAN_DIR)/man1
+ 	$(INSTALL_DIR) $(LIB_DIR)
+ 	set -e; \
+ 	for file in $(POSTSCRIPT); do \
+ 		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
+ 	done
+-	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
+ 
+ cdlabelgen-$(VERSION).spec: spec.template
+ 	sed -e "s/TAG_VERSION/$(VERSION)/" < $? > $@
diff --git a/app-cdr/cdlabelgen/metadata.xml b/app-cdr/cdlabelgen/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/cdlabelgen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
new file mode 100644
index 000000000000..e8d968a56756
--- /dev/null
+++ b/app-cdr/cdrdao/Manifest
@@ -0,0 +1 @@
+DIST cdrdao-1.2.3.tar.bz2 1428695 SHA256 8193cb8fa6998ac362c55807e89ad0b3c63edc6b01afaeb3d5042519527fb75e SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6 WHIRLPOOL 830d89a1ea2fe87c1b43a36d0f0d45bc372fc65beafa95057a13f0571d89ee43bd5f6fabfd643a481a3f4f8c4c758caff9fa5f60fffbefc4c976bf98133d89f7
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..0eed46b0c7a6
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+if [[ ${PV/*_rc*} ]]
+then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+else
+	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="gcdmaster encode mad vorbis"
+
+RDEPEND="virtual/cdrtools
+	encode? ( >=media-sound/lame-3.99 )
+	gcdmaster? (
+		dev-libs/libsigc++:2
+		>=dev-cpp/gtkmm-2.4:2.4
+		>=dev-cpp/libgnomeuimm-2.6:2.6
+		media-libs/libao
+		)
+	mad? (
+		media-libs/libmad
+		media-libs/libao
+		)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libao
+		)
+	!app-cdr/cue2toc
+	!dev-util/pccts"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc212.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with gcdmaster xdao) \
+		$(use_with vorbis ogg-support) \
+		$(use_with mad mp3-support) \
+		$(use_with encode lame)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
new file mode 100644
index 000000000000..dbfc96cb93bf
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/332237
+
+--- dao/ScsiIf-linux.cc
++++ dao/ScsiIf-linux.cc
+@@ -30,6 +30,7 @@
+ #include <asm/param.h>
+ #include <scsi/scsi.h>
+ #include <scsi/sg.h>
++#include <sys/stat.h>
+ 
+ #include "ScsiIf.h"
+ #include "sg_err.h"
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
new file mode 100644
index 000000000000..de17ceb3ec77
--- /dev/null
+++ b/app-cdr/cdrdao/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+  CD command line recording, ripping and copying tool.  Especially ISOs- and
+  bin/cue-files are handled very well.
+</longdescription>
+<use>
+	<flag name='gcdmaster'>Enable building of gcdmaster application</flag>
+</use>
+</pkgmetadata>
diff --git a/app-cdr/cdrkit/Manifest b/app-cdr/cdrkit/Manifest
new file mode 100644
index 000000000000..4fc8d1e868aa
--- /dev/null
+++ b/app-cdr/cdrkit/Manifest
@@ -0,0 +1,2 @@
+DIST cdrkit-1.1.11-libcdio-paranoia.tar.xz 18664 SHA256 366727c6806f689fbb79b4bc64fe216c54428823f56f8375ff95529529231a8b SHA512 aa1e1a7a750872f80a363789573c7ccb7a30702e7770456a15abb7d2d7d2fc5f705fa8a006e022ac006d88ce985a848c2a7a33e52f1c1e91f13cac0349d8ac6e WHIRLPOOL 95610295a693bdd96c4b6f1c336b9cc2e24df38f07272691b437976228b355f6170c185c0fcc28739618147c7a2dce831765ef1598694f37c2afb60de114bac1
+DIST cdrkit_1.1.11.orig.tar.gz 1445133 SHA256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da SHA512 e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05 WHIRLPOOL e836af6a8786e38965e7238fddef3b4746234a2d96afaa18b5a23baa36c13506f78c1ec50d97b4bc7374daf5db78e9b7775184ec16f8513c10dc3b9b18a2d395
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild
new file mode 100644
index 000000000000..ec586da83b6e
--- /dev/null
+++ b/app-cdr/cdrkit/cdrkit-1.1.11-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils eutils
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://cdrkit.org"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="debug hfs unicode"
+
+RDEPEND="app-arch/bzip2
+	!app-cdr/cdrtools
+	media-sound/cdparanoia
+	sys-apps/file
+	sys-libs/zlib
+	unicode? ( virtual/libiconv )
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	hfs? ( sys-apps/file )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-paranoiacdda.patch \
+		"${FILESDIR}"/${P}-cmakewarn.patch
+
+	echo '.so wodim.1' > ${T}/cdrecord.1
+	echo '.so genisoimage.1' > ${T}/mkisofs.1
+	echo '.so icedax.1' > ${T}/cdda2wav.1
+	echo '.so readom.1' > ${T}/readcd.1
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym wodim /usr/bin/cdrecord
+	dosym genisoimage /usr/bin/mkisofs
+	dosym icedax /usr/bin/cdda2wav
+	dosym readom /usr/bin/readcd
+
+	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
+
+	local x
+	for x in genisoimage plattforms wodim icedax; do
+		docinto ${x}
+		dodoc doc/${x}/*
+	done
+
+	insinto /etc
+	newins wodim/wodim.dfl wodim.conf
+	newins netscsid/netscsid.dfl netscsid.conf
+
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/usal
+	doins include/usal/*.h
+	dosym usal /usr/include/scsilib/scg
+
+	doman "${T}"/*.1
+}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
new file mode 100644
index 000000000000..a3e8b8b468a1
--- /dev/null
+++ b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://cdrkit.org"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-libcdio-paranoia.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="debug hfs unicode"
+
+RDEPEND="app-arch/bzip2
+	!app-cdr/cdrtools
+	dev-libs/libcdio-paranoia
+	sys-apps/file
+	sys-libs/zlib
+	unicode? ( virtual/libiconv )
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	hfs? ( sys-apps/file )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-cmakewarn.patch \
+		"${WORKDIR}"/patches/${P}-paranoiacdda.patch \
+		"${WORKDIR}"/patches/${P}-paranoiacdio.patch
+
+	echo '.so wodim.1' > ${T}/cdrecord.1
+	echo '.so genisoimage.1' > ${T}/mkisofs.1
+	echo '.so icedax.1' > ${T}/cdda2wav.1
+	echo '.so readom.1' > ${T}/readcd.1
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym wodim /usr/bin/cdrecord
+	dosym genisoimage /usr/bin/mkisofs
+	dosym icedax /usr/bin/cdda2wav
+	dosym readom /usr/bin/readcd
+
+	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
+
+	local x
+	for x in genisoimage plattforms wodim icedax; do
+		docinto ${x}
+		dodoc doc/${x}/*
+	done
+
+	insinto /etc
+	newins wodim/wodim.dfl wodim.conf
+	newins netscsid/netscsid.dfl netscsid.conf
+
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/usal
+	doins include/usal/*.h
+	dosym usal /usr/include/scsilib/scg
+
+	doman "${T}"/*.1
+}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11.ebuild
new file mode 100644
index 000000000000..b1e6dc39d9d1
--- /dev/null
+++ b/app-cdr/cdrkit/cdrkit-1.1.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit cmake-utils
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://cdrkit.org"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+IUSE="debug hfs unicode"
+
+RDEPEND="app-arch/bzip2
+	!app-cdr/cdrtools
+	sys-apps/file
+	sys-libs/zlib
+	unicode? ( virtual/libiconv )
+	kernel_linux? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	hfs? ( sys-apps/file )"
+
+src_prepare() {
+	echo '.so wodim.1' > ${T}/cdrecord.1
+	echo '.so genisoimage.1' > ${T}/mkisofs.1
+	echo '.so icedax.1' > ${T}/cdda2wav.1
+	echo '.so readom.1' > ${T}/readcd.1
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym wodim /usr/bin/cdrecord || die
+	dosym genisoimage /usr/bin/mkisofs || die
+	dosym icedax /usr/bin/cdda2wav || die
+	dosym readom /usr/bin/readcd || die
+
+	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
+
+	local x
+	for x in genisoimage plattforms wodim icedax; do
+		docinto ${x}
+		dodoc doc/${x}/*
+	done
+
+	insinto /etc
+	newins wodim/wodim.dfl wodim.conf || die
+	newins netscsid/netscsid.dfl netscsid.conf || die
+
+	insinto /usr/include/scsilib
+	doins include/*.h || die
+	insinto /usr/include/scsilib/usal
+	doins include/usal/*.h || die
+	dosym usal /usr/include/scsilib/scg || die
+
+	doman "${T}"/*.1
+}
diff --git a/app-cdr/cdrkit/files/cdrkit-1.1.11-cmakewarn.patch b/app-cdr/cdrkit/files/cdrkit-1.1.11-cmakewarn.patch
new file mode 100644
index 000000000000..b60b84982683
--- /dev/null
+++ b/app-cdr/cdrkit/files/cdrkit-1.1.11-cmakewarn.patch
@@ -0,0 +1,10 @@
+http://pkgs.fedoraproject.org/cgit/cdrkit.git/tree/cdrkit-1.1.11-cmakewarn.patch
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 2.8)
++cmake_policy(SET CMP0015 OLD)
+ PROJECT (cdrkit C)
+ SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+ 
diff --git a/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch b/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch
new file mode 100644
index 000000000000..5455ced82f4c
--- /dev/null
+++ b/app-cdr/cdrkit/files/cdrkit-1.1.11-paranoiacdda.patch
@@ -0,0 +1,554 @@
+http://bugs.gentoo.org/206939
+
+http://pkgs.fedoraproject.org/cgit/cdrkit.git/tree/cdrkit-1.1.11-paranoiacdda.patch modified because
+we install headers to $includedir instead of $includedir/cdda
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -1,3 +1,3 @@
+ PROJECT (cdrkit C)
+-SUBDIRS(include genisoimage wodim libedc libhfs_iso libparanoia icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
++SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
+ 
+--- icedax/CMakeLists.txt
++++ icedax/CMakeLists.txt
+@@ -1,8 +1,9 @@
+ PROJECT (icedax C)
+-INCLUDE_DIRECTORIES(../include ../wodim ../libparanoia ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
++INCLUDE_DIRECTORIES(../include ../wodim ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include)
+ include(../include/AddScgBits.cmake)
+ include(../include/AddSchilyBits.cmake)
+ include(../include/AddNetworkBits.cmake)
++INCLUDE (CheckLibraryExists) 
+ 
+ FIND_FILE (HAVE_SYS_SOUNDCARD_H sys/soundcard.h)
+ IF(HAVE_SYS_SOUNDCARD_H)
+@@ -18,12 +19,20 @@ IF(HAVE_LIBOSSAUDIO)
+    LIST(APPEND EXTRA_LIBS "ossaudio")
+ ENDIF(HAVE_LIBOSSAUDIO)
+ 
+-LIST(APPEND EXTRA_LIBS  paranoia)
++CHECK_INCLUDE_FILES(cdda_interface.h HAVE_CDDA_INTERFACE_H)
++CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
++IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
++   LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
++ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
++   MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
++ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
++	
++LIST(APPEND EXTRA_LIBS)
+ IF (WIN32)
+ 	LIST(APPEND EXTRA_LIBS winmm)
+ ENDIF (WIN32)
+ 
+-LINK_DIRECTORIES(../librols ../libusal  ../libparanoia)
++LINK_DIRECTORIES(../librols ../libusal)
+ ADD_EXECUTABLE (icedax aifc.c aiff.c base64.c icedax.c interface.c ioctl.c raw.c resample.c ringbuff.c scsi_cmds.c semshm.c setuid.c sha_func.c sndconfig.c sun.c toc.c wav.c)
+ TARGET_LINK_LIBRARIES(icedax wodimstuff ${EXTRA_LIBS})
+ SET_TARGET_PROPERTIES(icedax PROPERTIES  SKIP_BUILD_RPATH TRUE)
+--- icedax/global.h
++++ icedax/global.h
+@@ -17,7 +17,8 @@
+ #include "md5.h"
+ #endif
+ #ifdef	USE_PARANOIA
+-#include "cdda_paranoia.h"
++#include <cdda_interface.h>
++#include <cdda_paranoia.h>
+ #endif
+ 
+ typedef struct index_list
+@@ -102,10 +103,10 @@ typedef struct global
+ 
+ 	struct paranoia_parms_t
+ 	{
+-	        Ucbit	disable_paranoia:1;
+-	        Ucbit	disable_extra_paranoia:1;
+-	        Ucbit	disable_scratch_detect:1;
+-	        Ucbit	disable_scratch_repair:1;
++	        char	disable_paranoia:1;
++	        char	disable_extra_paranoia:1;
++	        char	disable_scratch_detect:1;
++	        char	disable_scratch_repair:1;
+ 		int	retries;
+ 		int	overlap;
+ 		int	mindynoverlap;
+--- icedax/icedax.c
++++ icedax/icedax.c
+@@ -120,6 +120,10 @@
+ #ifdef	USE_LAME
+ #include "mp3.h"	/* mp3 file handling */
+ #endif
++#ifdef	USE_PARANOIA
++#include <cdda_interface.h>
++#include <cdda_paranoia.h>
++#endif
+ #include "interface.h"  /* low level cdrom interfacing */
+ #include "icedax.h"
+ #include "resample.h"
+@@ -128,9 +132,6 @@
+ #include "ringbuff.h"
+ #include "global.h"
+ #include "exitcodes.h"
+-#ifdef	USE_PARANOIA
+-#include "cdda_paranoia.h"
+-#endif
+ #include "defaults.h"
+ 
+ static void RestrictPlaybackRate(long newrate);
+@@ -800,7 +801,7 @@ static void init_globals()
+   global.useroverlap = -1;      /* amount of overlapping sectors user override */
+   global.need_hostorder = 0;	/* processing needs samples in host endianess */
+   global.in_lendian = -1;	/* input endianess from SetupSCSI() */
+-  global.outputendianess = NONE; /* user specified output endianess */
++  global.outputendianess = NONE_EN; /* user specified output endianess */
+   global.findminmax  =  0;	/* flag find extrem amplitudes */
+ #ifdef HAVE_LIMITS_H
+   global.maxamp[0] = INT_MIN;	/* maximum amplitude */
+@@ -2418,7 +2419,7 @@ Rate   Divider      Rate   Divider
+   if (bulk == -1) bulk = 0;
+ 
+   global.need_big_endian = global.audio_out->need_big_endian;
+-  if (global.outputendianess != NONE)
++  if (global.outputendianess != NONE_EN)
+     global.need_big_endian = global.outputendianess == BIG;
+ 
+   if (global.no_file) global.fname_base[0] = '\0';
+@@ -2602,7 +2603,7 @@ Rate   Divider      Rate   Divider
+     fputs( ", soundcard", stderr );
+ #endif
+ #if defined USE_PARANOIA
+-    fputs( ", libparanoia", stderr );
++    fputs( ", libcdda_paranoia", stderr );
+ #endif
+     fputs( " support\n", stderr );
+   }
+@@ -2892,8 +2893,28 @@ Rate   Divider      Rate   Divider
+ #ifdef	USE_PARANOIA
+ 	if (global.paranoia_selected) {
+ 		long paranoia_mode;
++		cdrom_drive *tmpdrive;
++		usal_close(get_scsi_p());
+ 
+-		global.cdp = paranoia_init(get_scsi_p(), global.nsectors);
++		tmpdrive = cdda_identify(global.dev_name, 0, NULL);
++		if (!tmpdrive)
++		{
++			fputs("Can't identify disc\n", stderr);
++                	return 1;
++		}
++
++		if(global.nsectors)
++		{
++		  tmpdrive->nsectors = global.nsectors;
++		  tmpdrive->bigbuff = global.nsectors * CD_FRAMESIZE_RAW;
++		}
++		if (cdda_open(tmpdrive) != 0)
++		{
++		  fputs("Can't open disc\n", stderr);
++		  cdda_close(tmpdrive);
++		  return 1;
++		}
++		global.cdp = paranoia_init(tmpdrive);
+ 
+ 		if (global.paranoia_parms.overlap >= 0) {
+ 			int	overlap = global.paranoia_parms.overlap;
+@@ -2902,17 +2923,7 @@ Rate   Divider      Rate   Divider
+ 				overlap = global.nsectors - 1;
+ 			paranoia_overlapset(global.cdp, overlap);
+ 		}
+-		/*
+-		 * Default to a  minimum of dynamic overlapping == 0.5 sectors.
+-		 * If we don't do this, we get the default from libparanoia
+-		 * which is approx. 0.1.
+-		 */
+-		if (global.paranoia_parms.mindynoverlap < 0)
+-			paranoia_dynoverlapset(global.cdp, CD_FRAMEWORDS/2, -1);
+-		paranoia_dynoverlapset(global.cdp,
+-			global.paranoia_parms.mindynoverlap * CD_FRAMEWORDS,
+-			global.paranoia_parms.maxdynoverlap * CD_FRAMEWORDS);
+-
++	
+ 		paranoia_mode = PARANOIA_MODE_FULL ^ PARANOIA_MODE_NEVERSKIP;
+ 
+ 		if (global.paranoia_parms.disable_paranoia) {
+--- icedax/icedax.h
++++ icedax/icedax.h
+@@ -41,7 +41,7 @@
+ 
+ /* Endianess */
+ #define GUESS (-2)
+-#define NONE (-1)
++#define NONE_EN (-1)
+ #define LITTLE 0
+ #define BIG 1
+ 
+--- icedax/interface.c
++++ icedax/interface.c
+@@ -116,7 +116,7 @@ int		(*Play_at)(SCSI *usalp, unsigned in
+ int		(*StopPlay)(SCSI *usalp);
+ void		(*trash_cache)(UINT4 *p, unsigned lSector, unsigned SectorBurstVal);
+ 
+-#if	defined	USE_PARANOIA
++#if	0 //defined	USE_PARANOIA
+ long cdda_read(void *d, void *buffer, long beginsector, long sectors);
+ 
+ long cdda_read(void *d, void *buffer, long beginsector, long sectors)
+--- icedax/toc.c
++++ icedax/toc.c
+@@ -379,8 +379,7 @@ static void emit_cddb_form(char *fname_b
+ static void emit_cdindex_form(char *fname_baseval);
+ #endif
+ 
+-
+-typedef struct TOC {	/* structure of table of contents (cdrom) */
++typedef struct TOC_t {	/* structure of table of contents (cdrom) */
+ 	unsigned char reserved1;
+ 	unsigned char bFlags;
+ 	unsigned char bTrack;
+@@ -391,8 +390,7 @@ typedef struct TOC {	/* structure of tab
+ 	int frms;
+ 	unsigned char ISRC[16];
+ 	int	SCMS;
+-} TOC;
+-
++} TOC_t;
+ 
+ /* Flags contains two fields:
+     bits 7-4 (ADR)
+@@ -432,7 +430,7 @@ struct iterator {
+ 	int index;
+ 	int startindex;
+ 	void        (*reset)(struct iterator *this);
+-	struct TOC *(*getNextTrack)(struct iterator *this);
++	struct TOC_t *(*getNextTrack)(struct iterator *this);
+ 	int         (*hasNextTrack)(struct iterator *this);
+ };
+ 
+@@ -518,7 +516,7 @@ unsigned FixupTOC(unsigned no_tracks)
+ 		    InitIterator(&i, 1);
+ 
+ 	    while (i.hasNextTrack(&i)) {
+-		    struct TOC *p = i.getNextTrack(&i);
++		    struct TOC_t *p = i.getNextTrack(&i);
+ 		    if (IS__AUDIO(p)) count_audio_tracks++;
+ 	    }
+ 
+@@ -733,7 +731,7 @@ static void emit_cddb_form(char *fname_b
+   fprintf( cddb_form, "# Track frame offsets:\n#\n");
+ 
+   while (i.hasNextTrack(&i)) {
+-	  struct TOC *p = i.getNextTrack(&i);
++	  struct TOC_t *p = i.getNextTrack(&i);
+ 	  if (GETTRACK(p) == CDROM_LEADOUT) break;
+ 	  fprintf( cddb_form,
+ 		   "# %lu\n", 150 + Get_AudioStartSector(GETTRACK(p)));
+@@ -765,7 +763,7 @@ static void emit_cddb_form(char *fname_b
+ 
+   i.reset(&i);
+   while (i.hasNextTrack(&i)) {
+-	  struct TOC *p = i.getNextTrack(&i);
++	  struct TOC_t *p = i.getNextTrack(&i);
+ 	  int ii;
+ 
+ 	  ii = GETTRACK(p);
+@@ -788,7 +786,7 @@ static void emit_cddb_form(char *fname_b
+ 
+   i.reset(&i);
+   while (i.hasNextTrack(&i)) {
+-	  struct TOC *p = i.getNextTrack(&i);
++	  struct TOC_t *p = i.getNextTrack(&i);
+ 	  int ii;
+ 
+ 	  ii = GETTRACK(p);
+@@ -1495,7 +1493,7 @@ static int IsSingleArtist(void)
+ 	InitIterator(&i, 1);
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		struct TOC *p = i.getNextTrack(&i);
++		struct TOC_t *p = i.getNextTrack(&i);
+ 		int ii;
+ 
+ 		if (IS__DATA(p) || GETTRACK(p) == CDROM_LEADOUT) continue;
+@@ -1681,7 +1679,7 @@ static void emit_cdindex_form(char *fnam
+ 	 global.creator ? ascii2html(global.creator) : "");
+ 
+     while (i.hasNextTrack(&i)) {
+-	    struct TOC *p = i.getNextTrack(&i);
++	    struct TOC_t *p = i.getNextTrack(&i);
+ 	    int ii = GETTRACK(p);
+ 
+ 	    if (ii == CDROM_LEADOUT) break;
+@@ -1703,7 +1701,7 @@ static void emit_cdindex_form(char *fnam
+     fprintf( cdindex_form, "   <MultipleArtistCD>\n");
+ 
+     while (i.hasNextTrack(&i)) {
+-	    struct TOC *p = i.getNextTrack(&i);
++	    struct TOC_t *p = i.getNextTrack(&i);
+ 	    int ii = GETTRACK(p);
+ 
+ 	    if (ii == CDROM_LEADOUT) break;
+@@ -1942,9 +1940,9 @@ static void DisplayToc_with_gui(unsigned
+ 
+ 	if ((global.verbose & (SHOW_TOC | SHOW_STARTPOSITIONS | SHOW_SUMMARY | SHOW_TITLES)) != 0
+ 	    && i.hasNextTrack(&i)) {
+-		TOC *o = i.getNextTrack(&i);
++		TOC_t *o = i.getNextTrack(&i);
+ 		while (i.hasNextTrack(&i)) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 			int from;
+ 			from = GETTRACK(o);
+ 
+@@ -2072,9 +2070,9 @@ static void DisplayToc_no_gui(unsigned l
+ 	count_audio_trks = 0;
+ 
+ 	if (i.hasNextTrack(&i)) {
+-		TOC *o = i.getNextTrack(&i);
++		TOC_t *o = i.getNextTrack(&i);
+ 		while (i.hasNextTrack(&i)) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 			int from;
+ 			from = GETTRACK(o);
+ 
+@@ -2131,10 +2129,10 @@ static void DisplayToc_no_gui(unsigned l
+ 	i.reset(&i);
+ 	if ((global.verbose & SHOW_TOC) != 0 &&
+ 		i.hasNextTrack(&i)) {
+-		TOC *o = i.getNextTrack(&i);
++		TOC_t *o = i.getNextTrack(&i);
+ 
+ 		for (; i.hasNextTrack(&i);) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 
+ 			if ( GETTRACK(o) <= MAXTRK ) {
+ 				unsigned char brace1, brace2;
+@@ -2189,9 +2187,9 @@ static void DisplayToc_no_gui(unsigned l
+ 		ii = 0;
+ 		i.reset(&i);
+ 		if (i.hasNextTrack(&i)) {
+-			TOC *o = i.getNextTrack(&i);
++			TOC_t *o = i.getNextTrack(&i);
+ 			for ( ; i.hasNextTrack(&i);) {
+-				TOC *p = i.getNextTrack(&i);
++				TOC_t *p = i.getNextTrack(&i);
+ 				fprintf ( stderr,
+ 					  " %2u.(%8u)",
+ 					  GETTRACK(o),
+@@ -2248,7 +2246,7 @@ static void DisplayToc_no_gui(unsigned l
+ 
+ 		i.reset(&i);
+ 		for ( ; i.hasNextTrack(&i);) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 			int jj = GETTRACK(p);
+ 
+ 			if ( global.tracktitle[jj] != NULL ) {
+@@ -2260,7 +2258,7 @@ static void DisplayToc_no_gui(unsigned l
+ 		
+ 		i.reset(&i);
+ 		for ( ; i.hasNextTrack(&i); ) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 			int jj;
+ 
+ 			if (IS__DATA(p))
+@@ -2720,7 +2718,7 @@ void Read_MCN_ISRC(void)
+ 		InitIterator(&i, 1);
+ 
+ 		while (i.hasNextTrack(&i)) {
+-			struct TOC *p = i.getNextTrack(&i);
++			struct TOC_t *p = i.getNextTrack(&i);
+ 			unsigned ii = GETTRACK(p);
+ 			
+ 			if (ii == CDROM_LEADOUT) break;
+@@ -3155,7 +3153,7 @@ unsigned ScanIndices(unsigned track, uns
+ 
+ 
+   while (i.hasNextTrack(&i)) {
+-	  struct TOC *p = i.getNextTrack(&i);
++	  struct TOC_t *p = i.getNextTrack(&i);
+ 	  unsigned ii = GETTRACK(p);
+ 
+ 	  if ( ii < starttrack || IS__DATA(p) )
+@@ -3322,7 +3320,7 @@ unsigned char *Get_MCN(void)
+ }
+ 
+ 
+-static TOC g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
++static TOC_t g_toc [MAXTRK+1]; /* hidden track + 100 regular tracks */
+ 
+ /*#define IS_AUDIO(i) (!(g_toc[i].bFlags & 0x40))*/
+ 
+@@ -3397,10 +3395,10 @@ static int patch_cd_extra(unsigned track
+ 
+ static int restrict_tracks_illleadout(void)
+ {
+-	struct TOC *o = &g_toc[cdtracks+1];
++	struct TOC_t *o = &g_toc[cdtracks+1];
+ 	int i;
+ 	for (i = cdtracks; i >= 0; i--) {
+-		struct TOC *p = &g_toc[i];
++		struct TOC_t *p = &g_toc[i];
+ 		if (GETSTART(o) > GETSTART(p)) break;
+ 	}
+ 	patch_cd_extra(i+1, GETSTART(o));
+@@ -3523,7 +3521,7 @@ static void it_reset(struct iterator *th
+ 
+ 
+ static int it_hasNextTrack(struct iterator *this);
+-static struct TOC *it_getNextTrack(struct iterator *this);
++static struct TOC_t *it_getNextTrack(struct iterator *this);
+ 
+ static int it_hasNextTrack(struct iterator *this)
+ {
+@@ -3532,7 +3530,7 @@ static int it_hasNextTrack(struct iterat
+ 
+ 
+ 
+-static struct TOC *it_getNextTrack(struct iterator *this)
++static struct TOC_t *it_getNextTrack(struct iterator *this)
+ {
+ 	/* if ( (*this->hasNextTrack)(this) == 0 ) return NULL; */
+ 	if ( this->index > (int)cdtracks+1 ) return NULL;
+@@ -3583,7 +3581,7 @@ long Get_AudioStartSector(unsigned long
+ 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 
+ 		if (GETTRACK(p) == p_track) {
+ 			if (IS__DATA(p)) {
+@@ -3613,7 +3611,7 @@ long Get_StartSector(unsigned long p_tra
+ 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 
+ 		if (GETTRACK(p) == p_track) {
+ 			return GETSTART(p);
+@@ -3637,7 +3635,7 @@ long Get_EndSector(unsigned long p_track
+ 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 		if (GETTRACK(p) == p_track) {
+ 			p = i.getNextTrack(&i);
+ 			if (p == NULL) {
+@@ -3669,7 +3667,7 @@ long FirstAudioTrack(void)
+ 	else i.reset(&i);
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 		unsigned ii = GETTRACK(p);
+ 
+ 		if (ii == CDROM_LEADOUT) break;
+@@ -3687,7 +3685,7 @@ long FirstDataTrack(void)
+ 	else i.reset(&i);
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 		if (IS__DATA(p)) {
+ 			return GETTRACK(p);
+ 		}
+@@ -3708,7 +3706,7 @@ long LastAudioTrack(void)
+ 	else i.reset(&i);
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 		if (IS__AUDIO(p) && (GETTRACK(p) != CDROM_LEADOUT)) {
+ 			j = GETTRACK(p);
+ 		}
+@@ -3730,7 +3728,7 @@ long Get_LastSectorOnCd(unsigned long p_
+ 	if (p_track == cdtracks + 1) p_track = CDROM_LEADOUT;
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 
+ 		if (GETTRACK(p) < p_track)
+ 			continue;
+@@ -3749,9 +3747,9 @@ int Get_Track(unsigned long sector)
+ 	else i.reset(&i);
+ 
+ 	if (i.hasNextTrack(&i)) {
+-		TOC *o = i.getNextTrack(&i);
++		TOC_t *o = i.getNextTrack(&i);
+ 		while (i.hasNextTrack(&i)) {
+-			TOC *p = i.getNextTrack(&i);
++			TOC_t *p = i.getNextTrack(&i);
+ 			if ((GETSTART(o) <= sector) && (GETSTART(p) > sector)) {
+ 				if (IS__DATA(o)) {
+ 					return -1;
+@@ -3772,7 +3770,7 @@ int CheckTrackrange(unsigned long from,
+ 	else i.reset(&i);
+ 
+ 	while (i.hasNextTrack(&i)) {
+-		TOC *p = i.getNextTrack(&i);
++		TOC_t *p = i.getNextTrack(&i);
+ 
+ 		if (GETTRACK(p) < from)
+ 			continue;
+@@ -3788,54 +3786,3 @@ int CheckTrackrange(unsigned long from,
+ 	return 0;
+ }
+ 
+-#ifdef	USE_PARANOIA
+-long cdda_disc_firstsector(void *d);
+-
+-long cdda_disc_firstsector(void *d)
+-{
+-	return Get_StartSector(FirstAudioTrack());
+-}
+-
+-int cdda_tracks(void *d);
+-
+-int cdda_tracks(void *d)
+-{
+-	return LastAudioTrack() - FirstAudioTrack() +1;
+-}
+-
+-int cdda_track_audiop(void *d, int track);
+-
+-int cdda_track_audiop(void *d, int track)
+-{
+-	return Get_Datatrack(track) == 0;
+-}
+-
+-long cdda_track_firstsector(void *d, int track);
+-
+-long cdda_track_firstsector(void *d, int track)
+-{
+-	return Get_AudioStartSector(track);
+-}
+-
+-long cdda_track_lastsector(void *d, int track);
+-
+-long cdda_track_lastsector(void *d, int track)
+-{
+-	return Get_EndSector(track);
+-}
+-
+-long cdda_disc_lastsector(void *d);
+-
+-long cdda_disc_lastsector(void *d)
+-{
+-	return Get_LastSectorOnCd(cdtracks) - 1;
+-}
+-
+-int cdda_sector_gettrack(void *d,long sector);
+-
+-int cdda_sector_gettrack(void *d, long sector)
+-{
+-	return Get_Track(sector);
+-}
+-
+-#endif
diff --git a/app-cdr/cdrkit/metadata.xml b/app-cdr/cdrkit/metadata.xml
new file mode 100644
index 000000000000..115da0d401b2
--- /dev/null
+++ b/app-cdr/cdrkit/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<use>
+	<flag name='hfs'>Provide building of HFS (Apple) CD-images</flag>
+</use>
+</pkgmetadata>
+
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
new file mode 100644
index 000000000000..2628280397a0
--- /dev/null
+++ b/app-cdr/cdrtools/Manifest
@@ -0,0 +1,3 @@
+DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
+DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
+DIST cdrtools-3.01a30.tar.bz2 2097525 SHA256 5b9a2f98771c9d0097a1e7640727655ece2864eea95f38e5611af2b2f6e6d9cd SHA512 a78809451e0e2b5ca94d0fc34db24ad002c2a1dd6a2dde0ecd6178a4da92c2974acf399dd8fe5dc246bbc7c32106116e957ce8d3ad20773c5909264346570025 WHIRLPOOL bd11ade4585626531cb3d0a59c88979e2d33ef1e1984611276b0e7d10d12a371bd7e4068c7e65c3d0d65b73002313fd63eb93e953a82cf130459bffa3326ee7c
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
new file mode 100644
index 000000000000..8a54b5f1043b
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+src_prepare() {
+	gnuconfig_update
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete
+
+	# Adjusting hardcoded paths.
+	sed -i -e 's:opt/schily:usr:' \
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
+
+	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
+		$(find ./ -type f -exec grep -l 'INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
+
+	# Do not install static libraries.
+	sed -i -e 's:include\t\t.*rules.lib::' \
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+		rules1.top || die "sed rules1.top"
+	sed -i -e "/^\(CC\|DYNLD\|LDCC\|MKDEP\)/s|gcc|${tcCC}|" \
+		-e "/^\(CC++\|DYNLDC++\|LDCC++\|MKC++DEP\)/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s/-O//" \
+		-e 's/$(GCCOPTOPT)//' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#CONFFLAGS +=\t-cc=\$(XCC_COM)$|CONFFLAGS +=\t-cc=${tcCC}|g" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Create additional symlinks needed for some archs (armv4l already created)
+	local t
+	for t in armv4tl armv5tel armv7l ppc64 s390x; do
+		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
+		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
+	done
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+
+	sed -i \
+		-e "s:/opt/schily:/usr:g" \
+		-e "s:/usr/src/linux/include::g" \
+		-e "s:bin:root:g" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+# skip obsolete configure script
+src_configure() { : ; }
+
+src_compile() {
+	if use unicode; then
+		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
+
+	if ! use caps; then
+		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
+	fi
+
+	if ! use acl; then
+		CFLAGS="${CFLAGS} -DNO_ACL"
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+		LDOPTX="${LDFLAGS}" \
+		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
+		RUNPATH="" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CC="$(tc-getCC)" CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" \
+		LDOPTX="${LDFLAGS}" \
+		INS_BASE="${ED}/usr" INS_RBASE="${ED}" LINKMODE="dynamic" \
+		RUNPATH="" GMAKE_NOWARN="true" install
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
new file mode 100644
index 000000000000..fa531ad3e816
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
+src_prepare() {
+	gnuconfig_update
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete
+
+	# Adjusting hardcoded paths.
+	sed -i -e "s|opt/schily|usr|" \
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
+
+	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
+
+	# Do not install static libraries.
+	sed -i -e "s|include\t\t.*rules.lib||" \
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+		rules1.top || die "sed rules1.top"
+	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
+		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s|-O||" \
+		-e 's|$(GCCOPTOPT)||' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Add support for arm64
+	ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
+	ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local os=$(cdrtools_os)
+
+	sed -i \
+		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
+		-e "s|^\(RUNPATH=\).*|\1|" \
+		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+			"char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
+
+src_compile() {
+	if use unicode; then
+		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
+
+	if ! use caps; then
+		CFLAGS="${CFLAGS} -DNO_LINUX_CAPS"
+	fi
+
+	if ! use acl; then
+		CFLAGS="${CFLAGS} -DNO_ACL"
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha30.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha30.ebuild
new file mode 100644
index 000000000000..ddb0da5d7245
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha30.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+	caps? ( sys-libs/libcap )
+	nls? ( virtual/libintl )
+	!app-cdr/cdrkit"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+	local os="linux"
+	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+	echo "${os}"
+}
+
+src_prepare() {
+	gnuconfig_update
+
+	# Remove profiled make files.
+	find -name '*_p.mk' -delete
+
+	# Adjusting hardcoded paths.
+	sed -i -e "s|opt/schily|usr|" \
+		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+		|| die "sed opt/schily"
+
+	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
+		|| die "sed doc"
+
+	# Respect libdir.
+	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
+		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+		|| die "sed multilib"
+
+	# Do not install static libraries.
+	sed -i -e "s|include\t\t.*rules.lib||" \
+		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+		|| die "sed rules"
+
+	# Enable verbose build.
+	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
+		RULES/*.rul RULES/rules.prg RULES/rules.inc \
+		|| die "sed verbose rules"
+
+	# Respect CC/CXX variables.
+	cd "${S}"/RULES
+	local tcCC=$(tc-getCC)
+	local tcCXX=$(tc-getCXX)
+	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+		rules1.top || die "sed rules1.top"
+	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
+		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+		-e "/COPTOPT=/s|-O||" \
+		-e 's|$(GCCOPTOPT)||' \
+		cc-gcc.rul || die "sed cc-gcc.rul"
+	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+		rules.cnf || die "sed rules.cnf"
+
+	# Add support for arm64
+	ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
+	ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
+
+	# Schily make setup.
+	cd "${S}"/DEFAULTS
+	local os=$(cdrtools_os)
+
+	sed -i \
+		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+		-e "s|^\(LDPATH=\).*|\1|" \
+		-e "s|^\(RUNPATH=\).*|\1|" \
+		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+		-e '/^DEFUMASK/s,002,022,g' \
+		Defaults.${os} || die "sed Schily make setup"
+	# re DEFUMASK above:
+	# bug 486680: grsec TPE will block the exec if the directory is
+	# group-writable. This is painful with cdrtools, because it makes a bunch of
+	# group-writable directories during build. Change the umask on their
+	# creation to prevent this.
+}
+
+ac_cv_sizeof() {
+	cat <<-EOF >"${T}"/test.c
+	#include <inttypes.h>
+	#include <stddef.h>
+	#include <stdint.h>
+	#include <sys/types.h>
+	int main () {
+		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+		test_array [0] = 0;
+		return test_array [0];
+	}
+	EOF
+
+	local i=1
+	while [[ ${i} -lt 20 ]] ; do
+		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+			echo ${i}
+			return 0
+		fi
+		: $(( i += 1 ))
+	done
+	return 1
+}
+
+src_configure() {
+	use acl || export ac_cv_header_sys_acl_h="no"
+	use caps || export ac_cv_lib_cap_cap_get_proc="no"
+
+	# skip obsolete configure script
+	if tc-is-cross-compiler ; then
+		# Cache known values for targets. #486680
+
+		tc-export CC
+		local var val t types=(
+			char "short int" int "long int" "long long"
+			"unsigned char" "unsigned short int" "unsigned int"
+			"unsigned long int" "unsigned long long"
+			float double "long double" size_t ssize_t ptrdiff_t
+			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+			"char *" "unsigned char *"
+		)
+		for t in "${types[@]}" ; do
+			var="ac_cv_sizeof_${t// /_}"
+			var=${var//[*]/p}
+			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+			export "${var}=${val}"
+			einfo "Computing sizeof(${t}) as ${val}"
+		done
+		# We don't have these types.
+		export ac_cv_sizeof___int64=0
+		export ac_cv_sizeof_unsigned___int64=0
+		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+		export ac_cv_type_prototypes="yes"
+		export ac_cv_func_mlock{,all}="yes"
+		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+		export ac_cv_func_dtoa_r="no"
+		export ac_cv_func_sys_siglist{,_def}="no"
+		export ac_cv_func_printf_{j,ll}="yes"
+		export ac_cv_realloc_null="yes"
+		export ac_cv_no_user_malloc="no"
+		export ac_cv_var_timezone="yes"
+		export ac_cv_var___progname{,_full}="yes"
+		export ac_cv_fnmatch_igncase="yes"
+		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+		export ac_cv_file__usr_src_linux_include="no"
+
+		case $(cdrtools_os) in
+		linux)
+			export ac_cv_func_bsd_{g,s}etpgrp="no"
+			export ac_cv_hard_symlinks="yes"
+			export ac_cv_link_nofollow="yes"
+			export ac_cv_access_e_ok="no"
+
+			export ac_cv_dev_minor_noncontig="yes"
+			case ${ac_cv_sizeof_long_int} in
+			4) export ac_cv_dev_minor_bits="32";;
+			8) export ac_cv_dev_minor_bits="44";;
+			esac
+
+			cat <<-EOF >"${T}"/test.c
+			struct {
+				char start[6];
+				unsigned char x1:4;
+				unsigned char x2:4;
+				char end[5];
+			} a = {
+				.start = {'S', 't', 'A', 'r', 'T', '_'},
+				.x1 = 5,
+				.x2 = 4,
+				.end = {'_', 'e', 'N', 'd', 'X'},
+			};
+			EOF
+			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="no"
+			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+				export ac_cv_c_bitfields_htol="yes"
+			fi
+			;;
+		esac
+	fi
+}
+
+src_compile() {
+	if use unicode; then
+		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+		if [[ -n ${flags} ]]; then
+			append-flags ${flags}
+		else
+			ewarn "Your compiler does not support the options required to build"
+			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+		fi
+	fi
+
+	# If not built with -j1, "sometimes" cdda2wav will not be built.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+	# If not built with -j1, "sometimes" manpages are not installed.
+	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
+
+	# These symlinks are for compat with cdrkit.
+	dosym schily /usr/include/scsilib
+	dosym ../scg /usr/include/schily/scg
+
+	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+	cd "${S}"/cdda2wav
+	docinto cdda2wav
+	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+	cd "${S}"/mkisofs
+	docinto mkisofs
+	dodoc ChangeLog* TODO
+
+	# Remove man pages related to the build system
+	rm -rvf "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		einfo
+		einfo "Darwin/OS X use the following device names:"
+		einfo
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+		einfo
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+		einfo
+	fi
+}
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
new file mode 100644
index 000000000000..070540f55285
--- /dev/null
+++ b/app-cdr/cdrtools/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<maintainer>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>joerg.schilling@fokus.fraunhofer.de</email>
+			<description>Upstream author, please CC on bugs</description>
+		</maintainer>
+		<remote-id type="sourceforge">cdrtools</remote-id>
+	</upstream>
+	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
new file mode 100644
index 000000000000..2f245cfccd08
--- /dev/null
+++ b/app-cdr/cdw/Manifest
@@ -0,0 +1 @@
+DIST cdw-0.8.0.tar.gz 849851 SHA256 8f5bd7ed41bc07a84c5aa693bed3c38420e60ba6a3b5ae6ff8e41d78a4665fd2 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0 WHIRLPOOL 1ad447f47bb8d1fdd5868aa0c6a5bba2f76d65aa93a7be6841823215794c094a25f8e03be6573b3d46256ad33e8d20185e5f790b3f1b5320623b74fd7a2eef6c
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
new file mode 100644
index 000000000000..cbe4efd8aded
--- /dev/null
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://cdw.sourceforge.net"
+SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/cdrtools
+	app-cdr/dvd+rw-tools
+	dev-libs/libburn
+	dev-libs/libcdio[-minimal]
+	sys-libs/ncurses[unicode]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-uclibc.patch
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
+		default
+}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
new file mode 100644
index 000000000000..c5ae9a33577b
--- /dev/null
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
+ECVS_MODULE="cdw"
+ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
+
+inherit autotools eutils cvs
+
+MY_P=${PN}_${PV}
+DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://cdw.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="virtual/cdrtools
+	app-cdr/dvd+rw-tools
+	dev-libs/libburn
+	dev-libs/libcdio[-minimal]
+	sys-libs/ncurses[unicode]"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
+		default
+}
diff --git a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
new file mode 100644
index 000000000000..eedf7e13642b
--- /dev/null
+++ b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
@@ -0,0 +1,32 @@
+--- cdw-0.8.0/src/main.c
++++ cdw-0.8.0-uclibc/src/main.c
+@@ -44,7 +44,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __UCLIBC__
+ #include <mcheck.h>
++#endif
+ #include <signal.h> /* sig_atomic_t */
+ 
+ #include <dirent.h> /* PATH_MAX */
+--- cdw-0.8.0/src/tasks/cdw_create_image.c
++++ cdw-0.8.0-uclibc/src/tasks/cdw_create_image.c
+@@ -21,6 +21,7 @@
+ 
+ #include <inttypes.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include "cdw_file_manager.h"
+ #include "gettext.h"
+--- cdw-0.8.0/src/utilities/cdw_utils.c
++++ cdw-0.8.0-uclibc/src/utilities/cdw_utils.c
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "cdw_logging.h"
+ #include "gettext.h"
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
new file mode 100644
index 000000000000..ad1f3a24be3f
--- /dev/null
+++ b/app-cdr/cdw/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<maintainer>
+<email>mr_bones_@gentoo.org</email>
+<name>Michael Sterrett</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
new file mode 100644
index 000000000000..4a63ae532057
--- /dev/null
+++ b/app-cdr/cue2toc/Manifest
@@ -0,0 +1 @@
+DIST cue2toc-0.4.tar.gz 76689 SHA256 368c3816f75398fb5e941ba756812e5b151b4b47c9b2789120e9e73225885a78 SHA512 37fd4680890a38681331d4fb83a37daa9ddc39e45b2822930328796f1f57ac39635c609b27340b1ab06dd5b73720e77d96b601d1ee994c5ce836077a368cd95d WHIRLPOOL 9130ee51835950b47787738d8a33643408ae464e7e401dcf5f9c1fabbd8830ba79a385c59b7d2f81c2cd9bb4af4158df82feaa84bf08f8f550e3d40fcca8c595
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
new file mode 100644
index 000000000000..4d51129f4948
--- /dev/null
+++ b/app-cdr/cue2toc/cue2toc-0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Convert CUE files to cdrdao's TOC format"
+HOMEPAGE="http://cue2toc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="!app-cdr/cdrdao"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-cdr/cue2toc/metadata.xml b/app-cdr/cue2toc/metadata.xml
new file mode 100644
index 000000000000..132f38b47fc7
--- /dev/null
+++ b/app-cdr/cue2toc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription lang="en">
+		cue2toc is a free program for UNIX systems to convert CUE files to cdrdao's
+		TOC format. Features include: support for complete set of CUE commands (e.g.
+		catalog number, data and audio tracks, ISRC codes, CD-Text, Pre-/Postgaps
+		(with zero data or data from file), subindexes etc.), automatic determination
+		of session type and conversion of data files by user configurable commands
+		based on file name extension matching.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">cue2toc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
new file mode 100644
index 000000000000..7e2a6ca4390b
--- /dev/null
+++ b/app-cdr/cuecue/Manifest
@@ -0,0 +1 @@
+DIST cuecue-0.2.2.tar.gz 97927 SHA256 dbab57f1df3e50d041ba8cad0ee0851c1aea97c4685f89fd1d3259b4b79f081f SHA512 586ff819910532f19bf5c0b9ca61b3efe89a4699b05dba2ca6f4a9b78a1716264238e874405486f6b006cf84ed19a1cc96af510f815af9cdb0b76be3e1011595 WHIRLPOOL b4b6aba23aa41b83a9d4ae4703c3edd9920b3c83716750df72b1de3b839f806cbcfe229f979204f4cc3baa66ecfcfd689bec947d1ad0d0a4cd9b54b5b4e7e225
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..bb6ad7749334
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit base eutils flag-o-matic
+
+DESCRIPTION="Cuecue is a suite to convert .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="http://cuecue.berlios.de/"
+SRC_URI="mirror://berlios/cuecue/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug 254745"
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="mp3? ( media-libs/libmad )
+	flac? ( media-libs/flac )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )"
+
+PATCHES=( "${FILESDIR}/${P}-flac113.diff" ) # bug 157706
+DOCS="CHANGES README TODO"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-oggtest \
+		--disable-vorbistest \
+		$(use_enable flac) \
+		--disable-libFLACtest
+}
+
+src_compile() {
+	# fixes portage QA notice
+	append-flags "-ansi -pedantic"
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	default
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h || die "doins failed."
+}
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
new file mode 100644
index 000000000000..8a0252180d24
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
@@ -0,0 +1,130 @@
+diff -Naur src.orig/libcuecue/flac.c src/libcuecue/flac.c
+--- src.orig/libcuecue/flac.c	2004-09-22 04:28:21.000000000 +0200
++++ src/libcuecue/flac.c	2007-02-27 23:25:36.000000000 +0100
+@@ -27,6 +27,12 @@
+ #include "cuecue.h"
+ #include "cuecue_internal.h"
+ 
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ typedef struct Internal
+ {
+ 	FILE *dst;
+@@ -38,7 +44,11 @@
+ } Internal;
+ 
+ 
++#ifdef LEGACY_FLAC
+ void error(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#else
++void error(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
++#endif
+ {
+ 	Internal *internal = client_data;
+ 	switch (status) {
+@@ -52,11 +62,21 @@
+ 			strcpy(cuecue_error,"CRC Mismatch: FLAC file corrupted");
+ 			internal->error=1;
+ 			break;
++#ifndef LEGACY_FLAC
++		case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
++			strcpy(cuecue_error,"Unparseable stream");
++			internal->error=1;
++			break;
++#endif
+ 	}
+ }
+ 
+ 
++#ifdef LEGACY_FLAC
+ void metadata(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#else
++void metadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
++#endif
+ {
+ 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
+ 		/* get size of the file, for progress callback */
+@@ -66,7 +86,11 @@
+ }
+ 
+ 
++#ifdef LEGACY_FLAC
+ FLAC__StreamDecoderWriteStatus write(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#else
++FLAC__StreamDecoderWriteStatus write(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
++#endif
+ {
+ 	Internal *internal = client_data;
+ 	unsigned int samples = frame->header.blocksize;
+@@ -126,7 +150,11 @@
+ {
+ 	FILE *dst;
+ 	Internal internal;
++#ifdef LEGACY_FLAC
+ 	FLAC__FileDecoder *decoder;
++#else
++	FLAC__StreamDecoder *decoder;
++#endif
+ 
+ 	dst = fopen(file_destination, "wb");
+ 
+@@ -141,7 +169,11 @@
+ 	internal.error=0;
+ 	internal.dst=dst;
+ 
++#ifdef LEGACY_FLAC
+ 	decoder = FLAC__file_decoder_new();
++#else
++	decoder = FLAC__stream_decoder_new();
++#endif
+ 
+ 	if (decoder==NULL) {
+ 		snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot create FLAC decoder! memory error ?");
+@@ -150,6 +182,7 @@
+ 
+ 	internal.buffer = malloc(BUFFER_SIZE);
+ 
++#ifdef LEGACY_FLAC
+ 	FLAC__file_decoder_set_md5_checking(decoder, true);
+ 	FLAC__file_decoder_set_filename(decoder, file_source);
+ 
+@@ -162,8 +195,20 @@
+ 		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
+ 		internal.error=1;
+ 	}
++#else
++	FLAC__stream_decoder_set_md5_checking(decoder, true);
++	if(FLAC__stream_decoder_init_file(decoder, file_source, write, metadata, error, &internal) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
++		internal.error=1;
++	}
++#endif
+ 
+-	if(!FLAC__file_decoder_process_until_end_of_file(decoder)) {
++#ifdef LEGACY_FLAC
++	if(!FLAC__file_decoder_process_until_end_of_file(decoder))
++#else
++	if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
++#endif
++	{
+ 		if (!internal.error) {
+ 			/* early error, not even the time to decode metadata :) */
+ 			snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot open '%s'",file_source);
+@@ -171,8 +216,13 @@
+ 		internal.error=1;
+ 	}
+ 
++#ifdef LEGACY_FLAC
+ 	FLAC__file_decoder_finish(decoder);
+ 	FLAC__file_decoder_delete(decoder);
++#else
++	FLAC__stream_decoder_finish(decoder);
++	FLAC__stream_decoder_delete(decoder);
++#endif
+ 
+ 	fclose(dst);
+ 	free(internal.buffer);
diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml
new file mode 100644
index 000000000000..e0d2f24a7027
--- /dev/null
+++ b/app-cdr/cuecue/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription lang="en">
+		cuecue is a command line program to convert .cue + [.ogg|.flac|.wav|.mp3] to
+		.cue + .bin, in order to make them easier to burn with standard burning software.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/cuegen/Manifest b/app-cdr/cuegen/Manifest
new file mode 100644
index 000000000000..0d7f202abe0d
--- /dev/null
+++ b/app-cdr/cuegen/Manifest
@@ -0,0 +1 @@
+DIST cuegen-1.2.0.tar.gz 4411 SHA256 fd246ceca408f949f17581a4cc689b8a15c0ef3cd785aafb88909e1c63a93a63 SHA512 b1da7686944299994b8a04e3253aabc9c6b262f5f2d6d343d0ddd9b06d2c4b1e30441cfc9be6032675148e8d3146709924a486ef004102e02b5f90af7127d58e WHIRLPOOL c4a577be2f0f9e0b575880415c5e9802212298aa0126cfab69fe591d37f6e8d68ffef75fbaeef7c4169386fd9b76323e1ea4404b9cfb040a143c0cc274ddce9c
diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0.ebuild
new file mode 100644
index 000000000000..bc32e4aec8fa
--- /dev/null
+++ b/app-cdr/cuegen/cuegen-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux"
+HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html"
+SRC_URI="http://www.cs.man.ac.uk/~slavinp/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i -e 's:\(\${CFLAGS}\):\1 \${LDFLAGS}:g' Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin cuegen || die "install failed"
+	dodoc README
+}
diff --git a/app-cdr/cuegen/metadata.xml b/app-cdr/cuegen/metadata.xml
new file mode 100644
index 000000000000..0b894b75abe9
--- /dev/null
+++ b/app-cdr/cuegen/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription lang="en">
+		CUEgen is a FLAC-compatible cuesheet generator for Linux. The FLAC
+		format allows cuesheets to be embedded in .flac files by storing 
+		their data in the CUESHEET metadata block.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/cuetools/Manifest b/app-cdr/cuetools/Manifest
new file mode 100644
index 000000000000..034a761e0e8e
--- /dev/null
+++ b/app-cdr/cuetools/Manifest
@@ -0,0 +1,2 @@
+DIST cuetools-1.3.1-debian.patch.bz2 7622 SHA256 65bd4f3a306618383fb94eb452ecb01ff8c06622db6c6c48133a74bf962c4f2c SHA512 a79b7e05452e1b5c8aa385ba831abc1a0db2493f8a5a8ddcc1435f224e81f5a060d2e6152f707360501c284d0e1ef4840a2c6cca200eecf3b741d99f5c285ced WHIRLPOOL 895e4f4e0f3fe654c56081f544eabda0a0eebf9ea450802ac9f5e6b207ced5a13d7eca811c6e654195d07a06d4d0e05291dc39e32969dde500ad5c8623a72302
+DIST cuetools-1.3.1.tar.gz 161483 SHA256 6eb54fa619e55cb73348b2bfc71262a394cda280f613d3913e8c766d9cb2bdde SHA512 b1c3f782ea07743f765af5c03f6fbaaad1baa9fc93de1020406afa2b2a14ef5ab67db6647af5c855590102caab6061189744d4fb15eee92ecafd4b69fad338a2 WHIRLPOOL bc355f49daaafcdc050a4e2a1f1870533588008a27218e5ad45fd6e12a3953a3de375c95999103b6c144912486acff406cf498df6b24a869c0bcda33833f4edd
diff --git a/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild b/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..7c2f0c7a31c2
--- /dev/null
+++ b/app-cdr/cuetools/cuetools-1.3.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Utilities to manipulate and convert cue and toc files"
+HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="extras"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex"
+RDEPEND="extras? (
+		media-sound/vorbis-tools
+		media-libs/flac
+		media-sound/mp3info
+	)"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-flac.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README TODO
+	use extras && dobin extras/cuetag.sh
+	docinto extras
+	dodoc extras/{cueconvert.cgi,*.txt}
+}
diff --git a/app-cdr/cuetools/cuetools-1.3.1.ebuild b/app-cdr/cuetools/cuetools-1.3.1.ebuild
new file mode 100644
index 000000000000..189326a091c3
--- /dev/null
+++ b/app-cdr/cuetools/cuetools-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="Utilities to manipulate and convert cue and toc files"
+HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-debian.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	use ppc && epatch "${WORKDIR}/${P}-debian.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README TODO
+	insinto /usr/share/doc/${PF}/extras
+	doins extras/cue{convert.cgi,tag.sh}
+	docinto extras
+	dodoc extras/*.txt
+}
diff --git a/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch b/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch
new file mode 100644
index 000000000000..32c76b8b0ee7
--- /dev/null
+++ b/app-cdr/cuetools/files/cuetools-1.3.1-flac.patch
@@ -0,0 +1,16 @@
+Fix cuetag for media-libs/flac-1.2.1
+
+https://bugs.gentoo.org/show_bug.cgi?id=327271
+
+Patch written by Alexander Kozyrev <sequoiahead@gmail.com>
+--- a/extras/cuetag.sh
++++ b/extras/cuetag.sh
+@@ -18,7 +18,7 @@
+ {
+ 	# FLAC tagging
+ 	# --remove-vc-all overwrites existing comments
+-	METAFLAC="metaflac --remove-vc-all --import-vc-from=-"
++	METAFLAC="metaflac --remove-all-tags --import-tags-from=-"
+ 
+ 	# Ogg Vorbis tagging
+ 	# -w overwrites existing comments
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
new file mode 100644
index 000000000000..59121c9718a8
--- /dev/null
+++ b/app-cdr/cuetools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<use>
+		<flag name='extras'>Install additional script that tag files based on cue/toc file information</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-cdr/daa2iso/Manifest b/app-cdr/daa2iso/Manifest
new file mode 100644
index 000000000000..a661ba0a2682
--- /dev/null
+++ b/app-cdr/daa2iso/Manifest
@@ -0,0 +1 @@
+DIST daa2iso-0.1.7e.zip 49862 SHA256 f5990542bbfb632a18e664bb956d1dfa35b20945881c617af641a9ee8cfbc47b SHA512 dce00d3bfa4f4e60fd1cfa3ea606bdc8b9fdfc9ce14192ec0204a6da749dc2fb3a0f1de600c19f251e165c7b1f6b66fc14edcd97a38cfa4e163746cc8db5b38c WHIRLPOOL e1661935dd3ab5f44c10b5ee368602a0105a39a2657d1e93b22208767423457d403e5ceef50b1ca10d410d437cf0a84d4b14ce0c5cd97c257336b7196c360518
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
new file mode 100644
index 000000000000..09c011796b92
--- /dev/null
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+inherit base toolchain-funcs
+
+DESCRIPTION="Program for converting the DAA and GBI files to ISO"
+HOMEPAGE="http://aluigi.org/mytoolz.htm"
+SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/src"
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr install || die "emake install failed"
+}
diff --git a/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch b/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
new file mode 100644
index 000000000000..b084d7bb7236
--- /dev/null
+++ b/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
@@ -0,0 +1,22 @@
+Index: work/src/Makefile
+===================================================================
+--- work.orig/src/Makefile
++++ work/src/Makefile
+@@ -1,13 +1,12 @@
+ EXE		= daa2iso
+-CFLAGS	+= -O2 -s
+-PREFIX	= /usr/local
++PREFIX	= /usr/
+ BINDIR	= $(PREFIX)/bin
+ SRC		= $(EXE).c
+ 
+ all:
+-	$(CC) $(CFLAGS) -c LzmaDec.c
+-	$(CC) $(CFLAGS) -c tinflate.c
+-	$(CC) $(SRC) $(CFLAGS) -o $(EXE) LzmaDec.o tinflate.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -c LzmaDec.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -c tinflate.c
++	$(CC) $(SRC) $(CFLAGS) $(LDFLAGS) -o $(EXE) LzmaDec.o tinflate.o
+ 
+ install:
+ 	install -m 755 -d $(BINDIR)
diff --git a/app-cdr/daa2iso/metadata.xml b/app-cdr/daa2iso/metadata.xml
new file mode 100644
index 000000000000..5e3a61a90139
--- /dev/null
+++ b/app-cdr/daa2iso/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/app-cdr/disc-cover/Manifest b/app-cdr/disc-cover/Manifest
new file mode 100644
index 000000000000..89ebfb0acd08
--- /dev/null
+++ b/app-cdr/disc-cover/Manifest
@@ -0,0 +1 @@
+DIST disc-cover-1.5.6.tar.gz 52749 SHA256 037a181e3ee76f4b25d9a391c1d32481d6f0d5049b53d623c98bc0dbcd519d22 SHA512 ac00eeda8da63312afa16fdd4d12d160c651dc44aa44e769b92cad1dd9ddb10f123e8fc64e14853302455047ec86582fa9de423ccacd32912a078d2a21cb0d8c WHIRLPOOL 5ccb7b670a759ef57fc664bb15a97505bf07389063502fd0c6800b2b42d6cb9b3bd65d82a653b4d34c43dcb7e26446656b73698970c42b4128a98a1a745e0fa8
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6.ebuild
new file mode 100644
index 000000000000..b572b4ed184d
--- /dev/null
+++ b/app-cdr/disc-cover/disc-cover-1.5.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
+HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
+SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="cdrom"
+
+SLOT="0"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	virtual/latex-base
+	cdrom? ( dev-perl/Audio-CD-disc-cover )"
+
+src_compile() {
+	pod2man disc-cover > disc-cover.1 || die
+}
+
+src_install() {
+	dobin disc-cover
+	dodoc AUTHORS CHANGELOG TODO
+	doman disc-cover.1
+	insinto /usr/share/${PN}/templates
+	doins templates/*
+}
diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
new file mode 100644
index 000000000000..e9db3533b7bf
--- /dev/null
+++ b/app-cdr/disc-cover/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <longdescription>
+    This is the disc-cover CLI only. For the web application,
+    see www-apps/disc-cover. These two packages are tightly
+    bound by the fact that they come from the same source package.
+    That's why the web application ebuild is manually slotted to 0.
+  </longdescription>
+  <use>
+	  <flag name='cdrom'>Enable audio CD support. This is not needed to make
+		  www-apps/disc-cover work.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
new file mode 100644
index 000000000000..74814cb5109a
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -0,0 +1 @@
+DIST dvd+rw-tools-7.1.tar.gz 140846 SHA256 f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31 WHIRLPOOL 3bf4376106d228421437151979dab8e0f00089a3eea549e0769c916cc1be58b14ca24ff0b9eba36199e30d0e97aaaceeb98cba7330af50e666f0e570ee417f91
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
new file mode 100644
index 000000000000..9cb533303f0d
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental
+	sed -i '/FLAGS/s:-O2::' Makefile.m4
+
+	# Fix compilation when DFORTIFY_SOURCE=2
+	# https://bugs.gentoo.org/257360
+	# https://bugzilla.redhat.com/show_bug.cgi?id=426068
+	epatch "${FILESDIR}"/${PN}-7.0-wctomb.patch
+	epatch "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	# Allow burning small images on dvd-dl media.
+	# Patch snatched from Fedora, obviously correct.
+	epatch "${FILESDIR}"/${PN}-7.0-dvddl.patch
+	# Exit with non-zero status when child process does.
+	# https://bugzilla.redhat.com/show_bug.cgi?id=243036
+	epatch "${FILESDIR}"/${PN}-7.0-wexit.patch
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install || die
+	dohtml index.html
+}
+
+pkg_postinst() {
+	elog "When you run growisofs if you receive:"
+	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
+	elog "error message please run 'ulimit -l unlimited'"
+}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
new file mode 100644
index 000000000000..c1c6fb3332a2
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl.patch
@@ -0,0 +1,13 @@
+--- ./growisofs_mmc.cpp.joe	2006-04-27 20:45:00.788446635 +0200
++++ ./growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
new file mode 100644
index 000000000000..49742d3c4db0
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
@@ -0,0 +1,11 @@
+diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
+--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
++++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
++#include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
new file mode 100644
index 000000000000..56bd72575e8f
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb.patch
@@ -0,0 +1,11 @@
+--- transport.hxx~	2008-03-25 21:24:47.000000000 -0400
++++ transport.hxx	2008-03-25 21:25:36.000000000 -0400
+@@ -116,7 +116,7 @@
+ extern "C" char *plusminus_locale()
+ { static class __plusminus {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'�');
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
new file mode 100644
index 000000000000..e7910cbdd7b8
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
@@ -0,0 +1,11 @@
+--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
++++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
+@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
+ 	alarm(1);
+ 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
+ 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
+-	exit (0);
++	exit (WEXITSTATUS(i));
+     }
+ #endif
+ 
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
new file mode 100644
index 000000000000..6829312d3db5
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+dvdrtools is a fork of cdrtools, with the primary goal of supporting
+writable DVD drives.
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/dvd95/Manifest b/app-cdr/dvd95/Manifest
new file mode 100644
index 000000000000..f8bb544a4fc3
--- /dev/null
+++ b/app-cdr/dvd95/Manifest
@@ -0,0 +1 @@
+DIST dvd95-1.6p0.tar.gz 1068210 SHA256 fffa2e45d8f5d9cb9971abd14160b09a7362763fc70b402e016a8876c2c28fea SHA512 bb51c04a6609c986c54a1fd7b7f74dfa0f6b08d4cf1e93bc05271b1aae78881e9a4ffabbe7229ecf043964e039e866ea961b0c7aa72b276e9270d82adfbc24de WHIRLPOOL 7865339ea96446d06cf0829ba56436d6e940d32e9098c439091ecb3099a8f8cdf45f9c337107a6c32717b9f0c410c99d3a902a18f25ea3173da0bef298fedf62
diff --git a/app-cdr/dvd95/dvd95-1.6_p0.ebuild b/app-cdr/dvd95/dvd95-1.6_p0.ebuild
new file mode 100644
index 000000000000..30fcb5f37776
--- /dev/null
+++ b/app-cdr/dvd95/dvd95-1.6_p0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="DVD95 is a Gnome application to convert DVD9 to DVD5"
+HOMEPAGE="http://dvd95.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dvd95/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_mmx mpeg cpu_flags_x86_sse cpu_flags_x86_sse2"
+
+RDEPEND=">=gnome-base/libgnomeui-2
+	dev-libs/libxml2
+	media-libs/libdvdread
+	mpeg? ( media-libs/libmpeg2 )
+	media-video/mplayer"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	sys-apps/sed"
+
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3_p2-desktop-entry.patch
+	epatch "${FILESDIR}"/${P}-link-libxml2.patch
+	sed -i -e "s:-O3:${CFLAGS}:" configure.in || die "sed failed"
+	echo "dvd95.glade" >> po/POTFILES.in || die "translation fix failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_3dnow 3dnow) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable mpeg libmpeg2)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog
+}
diff --git a/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch b/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch
new file mode 100644
index 000000000000..e33662d26618
--- /dev/null
+++ b/app-cdr/dvd95/files/dvd95-1.3_p2-desktop-entry.patch
@@ -0,0 +1,16 @@
+diff -ur dvd95-1.3p2.orig/dvd95.desktop dvd95-1.3p2/dvd95.desktop
+--- dvd95-1.3p2.orig/dvd95.desktop	2007-04-10 22:53:38.000000000 +0300
++++ dvd95-1.3p2/dvd95.desktop	2008-06-06 22:53:00.000000000 +0300
+@@ -3,10 +3,9 @@
+ Comment=DVD9 to DVD5 converter
+ Comment[fr]=Convertisseur DVD9 vers DVD5
+ Exec=dvd95
+-Icon=dvd95/dvd9548.png
++Icon=/usr/share/pixmaps/dvd95/dvd9548.png
+ Terminal=false
+ Type=Application
+-Encoding=UTF-8
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ X-Desktop-File-Install-Version=0.10
+ 
diff --git a/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch b/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch
new file mode 100644
index 000000000000..0455e00a39b9
--- /dev/null
+++ b/app-cdr/dvd95/files/dvd95-1.6_p0-link-libxml2.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.am	2012-12-02 16:43:55.667719253 +0100
++++ src/Makefile.am	2012-12-02 16:44:05.965593153 +0100
+@@ -36,6 +36,6 @@
+ 	badsect.c badsect.h \
+ 	globals.h proto.h const.h vapcontext.h
+ 
+-dvd95_LDADD = @PACKAGE_LIBS@ $(LIBAUTHOR_LIBS) $(INTLLIBS) -ldvdread -lm
++dvd95_LDADD = @PACKAGE_LIBS@ $(LIBAUTHOR_LIBS) $(INTLLIBS) -ldvdread -lm -lxml2
+ 
+ 
diff --git a/app-cdr/dvd95/metadata.xml b/app-cdr/dvd95/metadata.xml
new file mode 100644
index 000000000000..917d7033c489
--- /dev/null
+++ b/app-cdr/dvd95/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">dvd95</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
new file mode 100644
index 000000000000..9a187cf63e5b
--- /dev/null
+++ b/app-cdr/dvdisaster/Manifest
@@ -0,0 +1,2 @@
+DIST dvdisaster-0.72.2.tar.bz2 4145193 SHA256 62d00c399c99a3bba493405174aeb96bd8c2d428d01d24b46858a55531b725ae SHA512 5283c5a0f9120a02434c8561f130d497db8eb7dab646f12d9cba9bc3a3ffa97974d783a9a8c67fb0669bba9ab5306545457c29e64b6a6e7a2722d1833dbcba11 WHIRLPOOL b1732e89f11e3e2f29bfa0fc661502eae4c10eb27d6186ca0a79405ca3e40388a2499b9990046fe002717b76332437978b0bcc8ef1cc421fbcbb1abf85198d2e
+DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 SHA256 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272 WHIRLPOOL 888b9643e4102e4c7f237b336bbead60fd02833357775f586766672ea182ce680615a74f9547cf015b3e0edb269fe905a4dd5f28cbf765f3c7f114e097736208
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
new file mode 100644
index 000000000000..e07468438ae0
--- /dev/null
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome2-utils versionator
+
+MY_P=${PN}-$(replace_version_separator 2 '.')
+
+DESCRIPTION="Data-protection and recovery tool for DVDs"
+HOMEPAGE="http://dvdisaster.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+SLOT="0"
+IUSE="debug linguas_cs linguas_de linguas_it linguas_ru cpu_flags_x86_sse2"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	media-libs/libpng
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.72.1-libpng15.patch
+}
+
+# - There is no autotools, use_ functions won't work
+# - NLS disabled because sys-devel/gettext fails, if you enable it
+# you need also virtual/libintl because it links to it for FreeBSD
+src_configure() {
+	local myconf
+
+	if use cpu_flags_x86_sse2; then
+		myconf+=" --with-sse2=yes"
+	else
+		myconf+=" --with-sse2=no"
+	fi
+
+	use debug && myconf+=" --with-memdebug=yes"
+
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--docsubdir=${PF} \
+		--localedir=/usr/share/locale \
+		--buildroot="${D}" \
+		--with-nls=no \
+		${myconf} || die
+}
+
+src_install() {
+	emake install
+
+	newicon contrib/${PN}48.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN} "System;Utility"
+
+	for res in 16 32 48 64; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins contrib/${PN}${res}.png ${PN}.png
+	done
+
+	local dest="${D}/usr/share"
+
+	for lang in cs de it ru; do
+		use linguas_${lang} || rm -rf ${dest}/doc/${PF}/${lang} \
+			${dest}/doc/${PF}/CREDITS.${lang} ${dest}/man/${lang}
+	done
+
+	rm -f "${D}"/usr/bin/*.sh
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
new file mode 100644
index 000000000000..cf4294473c27
--- /dev/null
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="Data-protection and recovery tool for DVDs"
+HOMEPAGE="http://dvdisaster.sourceforge.net/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug nls"
+
+dvdi_langs="cs de it pt_BR ru sv"
+for dvdi_lang in ${dvdi_langs}; do
+	IUSE+=" linguas_${dvdi_lang}"
+done
+unset dvdi_lang
+
+RDEPEND="app-arch/bzip2
+	>=dev-libs/glib-2.20
+	media-libs/libpng:0
+	sys-libs/zlib
+	>=x11-libs/gtk+-2.14:2"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig"
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc \
+		--docsubdir=${PF} \
+		--localedir=/usr/share/locale \
+		--buildroot="${D}" \
+		--with-nls=$(usex nls) \
+		--with-memdebug=$(usex debug) || die
+}
+
+src_compile() {
+	emake $(use nls && echo -j1) CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install
+	dobin tools/pngpack
+
+	newdoc tools/README README.pngpack
+	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
+
+	newicon contrib/${PN}48.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
+
+	local res
+	for res in 16 32 48 64; do
+		newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
+	done
+
+	local dest="${ED}"/usr/share
+
+	local dvdi_lang
+	for dvdi_lang in ${dvdi_langs}; do
+		use linguas_${dvdi_lang} || rm -rf \
+			${dest}/doc/${PF}/${dvdi_lang} \
+			${dest}/doc/${PF}/CREDITS.${dvdi_lang} \
+			${dest}/man/${dvdi_lang}
+	done
+
+	rm -f "${ED}"/usr/bin/*-uninstall.sh
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch
new file mode 100644
index 000000000000..3dc25f9b22ac
--- /dev/null
+++ b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- tools/pngio.c
++++ tools/pngio.c
+@@ -17,6 +17,8 @@
+  *  or direct your browser at http://www.gnu.org.
+  */
+ 
++#include <zlib.h>
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/dvdisaster/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
new file mode 100644
index 000000000000..6f83e8c306e4
--- /dev/null
+++ b/app-cdr/dvdshrink/Manifest
@@ -0,0 +1 @@
+DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 SHA256 bbc30055130e3179490d8d48fb8cea7ad649c4704c55e4d93abf832ab43d78e9 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06 WHIRLPOOL b789d49badef052b030d01206db18650ced6a5ad64a92979c7abe7faee9f89c0979c7d2e43a80c68eb1be2957fd8316237b50205b3987a2fb9d3800c52867de6
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
new file mode 100644
index 000000000000..03274bab9660
--- /dev/null
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Scriptable DVD copy software"
+HOMEPAGE="http://dvdshrink.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
+	>=media-video/mjpegtools-1.8.0-r1
+	>=media-video/subtitleripper-0.3.4-r1
+	>=media-video/dvdauthor-0.6.11
+	>=app-cdr/dvd+rw-tools-6.1
+	gtk? ( >=dev-perl/gtk2-perl-1.104 )
+	>=app-text/gocr-0.40
+	virtual/cdrtools"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -e 's:applications/::g' -i usr/bin/dvdsfunctions \
+		-i usr/bin/xdvdshrink.pl || die "sed failed."
+}
+
+src_install() {
+	dobin usr/bin/{batchrip.sh,dvds{functions,hrink}} || die "dobin failed."
+
+	if use gtk; then
+		dobin usr/bin/xdvdshrink.pl || die "dobin failed."
+	fi
+
+	insinto /usr/share
+	doins -r usr/share/applications/dvdshrink || die "doins failed."
+
+	dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
+
+	doicon usr/share/icons/{batchrip.xpm,dvdshrink.xpm}
+	use gtk && make_desktop_entry xdvdshrink.pl xDVDShrink ${PN} AudioVideo
+}
diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
new file mode 100644
index 000000000000..f82fae79b6ae
--- /dev/null
+++ b/app-cdr/dvdshrink/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription>
+XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
+archival copies of DVD content on single-layer writable DVDs.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">dvdshrink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
new file mode 100644
index 000000000000..6ac3eba81a08
--- /dev/null
+++ b/app-cdr/extract-xiso/Manifest
@@ -0,0 +1 @@
+DIST extract-xiso_v2.5_src.tgz 207052 SHA256 056bae1d970a1907aebebc796724fc82debac72010e8227f9ce5a470f16714d7 SHA512 ae73d5814167894f60530f9cb88485a9bcc39a60da87ed20b8b579f8e3f91542df102c2f9cb868ce61ff61c1a5add63d4bec66097f039c906353762358760dec WHIRLPOOL e59664007267ed5daa927e5669bb32050618af7282d5f672b2829c0782a9e8c4bc2da55534c7a4339defab14671e75d8c47d1fde0730874a9cf13486f47a1140
diff --git a/app-cdr/extract-xiso/extract-xiso-2.5.ebuild b/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
new file mode 100644
index 000000000000..f2b3d5452bb5
--- /dev/null
+++ b/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+MY_PV=${PV/_beta/b}
+
+DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
+HOMEPAGE="http://sourceforge.net/projects/extract-xiso"
+SRC_URI="mirror://sourceforge/extract-xiso/${PN}_v${MY_PV}_src.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e 's:__LINUX__:__linux__:' \
+		*.[ch] */*.[ch] || die
+}
+
+doit() { echo "$@"; "$@"; }
+
+src_compile() {
+	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
+		extract-xiso.c libftp-*/*.c -o extract-xiso || die
+}
+
+src_install() {
+	dobin extract-xiso || die
+	dodoc README.TXT
+}
diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml
new file mode 100644
index 000000000000..ca3c1304c920
--- /dev/null
+++ b/app-cdr/extract-xiso/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>xbox</herd>
+  <longdescription>Tool for extracting and creating optimised Xbox ISO images</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">extract-xiso</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
new file mode 100644
index 000000000000..e140986fa9a8
--- /dev/null
+++ b/app-cdr/gaffitter/Manifest
@@ -0,0 +1,2 @@
+DIST gaffitter-0.6.0.tar.bz2 44433 SHA256 61236240942d0319fb1c0a7e3da8424ddad7fe5abc82c2e1e3f2a89ccc9fe275 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6 WHIRLPOOL ad7a3fb80081e835ed3c1b7f2ff72d2119b73c8cec9cf7858c6fbd1abcf608f4048674b819b52e22672d389a6b44f182dd180653a85720bd0356d244c5b78558
+DIST scripts-0.1.0.tar.bz2 5859 SHA256 47efd56453b4e90c97238993790b06a707b6723892087d3ad18b0dc890b6696d SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20 WHIRLPOOL cfff56b45cf7d358916ad6ab32a97ffe087d1bb5271cfd6f750f6815f2c2ebd7b1654d4a946cb50dd757b75194a09fb8aff6b9b9dfee72c3c87ac1330d797261
diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..4bfd466cdd7f
--- /dev/null
+++ b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+SV="0.1.0"
+SCRIPTS="scripts-${SV}"
+
+DESCRIPTION="Genetic Algorithm File Fitter"
+HOMEPAGE="http://gaffitter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	scripts? (
+	mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="scripts"
+
+src_prepare() {
+	sed -i  -e "/^INCLUDES\ =.*/d" \
+		-e "s/^CXXFLAGS\ =.*/CXXFLAGS\ =\ ${CXXFLAGS} ${LDFLAGS}/" \
+		-e "s/^CXX\ =.*/CXX\ =\ $(tc-getCXX)/" src/Makefile || die "sed failed"
+	if use scripts; then
+		sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
+	fi
+}
+
+src_install() {
+	dobin src/gaffitter || die "dobin failed"
+	if use scripts; then
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-** || die
+		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-* || die
+	fi
+	dodoc AUTHORS README || die "dodoc failed"
+}
diff --git a/app-cdr/gaffitter/metadata.xml b/app-cdr/gaffitter/metadata.xml
new file mode 100644
index 000000000000..780907e68f91
--- /dev/null
+++ b/app-cdr/gaffitter/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="scripts">Install additional gaffitter scripts for external programs</flag>
+	</use>
+	<longdescription lang="en">
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gaffitter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
new file mode 100644
index 000000000000..4d297de17c2c
--- /dev/null
+++ b/app-cdr/gcdemu/Manifest
@@ -0,0 +1,2 @@
+DIST gcdemu-2.1.1.tar.bz2 40156 SHA256 cd1d59fb6dadbc05f5865c1654089563aeb28ef9ea4216da2e223f8376887c5c SHA512 1d8d9cc29a1d7a69681fbd4dc540a97172d81ac3d018bd98af469746901c8841dd5fd23ca8ae6fce68e41b43d98fb693acba1b621ed6b72c97972038cde1c47a WHIRLPOOL 0dbc04b57c5026a642a268b6bbba9d55ca27c92c1a606048a7395ebc07527e83ea05578c398725ed3782f4cf678769e0b77c686f07fe3061334875a375da3a05
+DIST gcdemu-3.0.0.tar.bz2 45506 SHA256 1357a02720f05644929bae167fcc64dc58784f406aa426bcd806955cc458aad4 SHA512 c4d0d64638e0f7ecccfe11ab1a8527ba2002a5bbb382b2d4e8b58eaaa0a10140ee85b8d62ba93fe4ecdc2882301dfe62a08373dbb9e5404d5ddf7592cd5f0b7d WHIRLPOOL 18c8615ad6ae166c2111e7dd2f1c1d46b4128d99bb11a3f7e2f297c58dfff3e38ad981547703b13af940b0d1e6e3bccb7098180fde51458bfe34e3b19a66a465
diff --git a/app-cdr/gcdemu/gcdemu-2.1.1.ebuild b/app-cdr/gcdemu/gcdemu-2.1.1.ebuild
new file mode 100644
index 000000000000..6036f35101c2
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-2.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="de fr no pl sl zh_CN"
+
+# cmake-utils after gnome2, to make sure cmake-utils is used for building
+inherit gnome2 cmake-utils l10n python-single-r1
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org/"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/6
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/gcdemu
+	# build system doesn't respect LINGUAS :/
+	l10n_find_plocales_changes po "" ".po"
+	rm_po() {
+		rm po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}
diff --git a/app-cdr/gcdemu/gcdemu-3.0.0.ebuild b/app-cdr/gcdemu/gcdemu-3.0.0.ebuild
new file mode 100644
index 000000000000..0ee700a83237
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-3.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="no sl sv"
+
+# cmake-utils after gnome2, to make sure cmake-utils is used for building
+inherit gnome2 cmake-utils l10n python-single-r1
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org/"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/7
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/gcdemu
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Build system doesn't respect LINGUAS, and changing list of installed
+	# translations requires error-prone editing of CMakeLists.txt
+	rm_po() {
+		rm -r "${ED}"/usr/share/locale/$1 || die
+		ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
diff --git a/app-cdr/gcdemu/metadata.xml b/app-cdr/gcdemu/metadata.xml
new file mode 100644
index 000000000000..e56b6a0cf661
--- /dev/null
+++ b/app-cdr/gcdemu/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>tetromino@gentoo.org</email>
+    <name>Alexandre Rostovtsev</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cdemu</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/gnomebaker/Manifest b/app-cdr/gnomebaker/Manifest
new file mode 100644
index 000000000000..9ed23e7a2937
--- /dev/null
+++ b/app-cdr/gnomebaker/Manifest
@@ -0,0 +1 @@
+DIST gnomebaker-0.6.4.tar.gz 1276117 SHA256 6e1ef94cafca7536fc3211a7abd4732f6dc5adc3c7c1b73184f5a87738117fb7 SHA512 954a05724d8d036580edbd5ded11bfd4389965b831ccf2d5a10dbd542c54db4f0519aa3277c6ebc139f55a2475987c48b557cc002e86d9cccca473f187666e34 WHIRLPOOL f951cc19ebd3d107e0d2386c2e58cc678521a31c1fd40e77769dc6758fefa86d375d92bd7bad3770c5e54e6e2de41357a5c66efbdab0276b09f41516049d1d47
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch
new file mode 100644
index 000000000000..bbc8ec7abc52
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch
@@ -0,0 +1,30 @@
+--- a/src/preferences.h
++++ b/src/preferences.h
+@@ -85,6 +85,7 @@
+ 
+ gboolean preferences_init();
+ void preferences_finalise();
++int preferences_get_default_backend();
+ 
+ gchar *preferences_get_copy_data_cd_image();
+ gchar *preferences_get_copy_dvd_image();
+--- a/src/backend.h
++++ b/src/backend.h
+@@ -30,6 +30,7 @@
+ 
+  
+ gboolean backend_is_backend_supported(enum backend b);
++gboolean backend_does_prog_exist(gchar* program);
+ 
+ 
+ #endif /* _BACKEND_H_ */
+--- a/src/gnomebaker.c
++++ b/src/gnomebaker.c
+@@ -32,6 +32,7 @@
+ #include "splashdlg.h"
+ #include "gbcommon.h"
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
++#include <libgnomevfs/gnome-vfs-ops.h>
+ #include <gst/gst.h>
+ #include "media.h"
+ #include "dataproject.h"
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch
new file mode 100644
index 000000000000..b8e4cf1ed551
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -255,7 +255,7 @@ gnomebaker_SOURCES = \
+ 	cairofillbar.c cairofillbar.h \
+ 	backend.c backend.h
+ 
+-gnomebaker_LDADD = @GNOMEBAKER_LIBS@
++gnomebaker_LDADD = @GNOMEBAKER_LIBS@ -lm
+ gnomebaker_LDFLAGS = -export-dynamic 
+ all: all-am
+ 
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..772d4f5d23d9
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- a/src/gblibnotify.c
++++ b/src/gblibnotify.c
+@@ -87,7 +87,15 @@
+ #ifdef HAVE_LIBNOTIFY
+ #if (LIBNOTIFY_VERSION_MINOR >= 3)
+ 	gint x, y;
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	global_notify = notify_notification_new (subject, content, "");
++#else
+ 	global_notify = notify_notification_new (subject, content, "", NULL);
++#endif
++#else
++	global_notify = notify_notification_new (subject, content, "", NULL);
++#endif
+ 	/* not sure if we have to free the pixbuf since it could be used internally in libnotify */
+     GdkPixbuf *icon_pixbuf = gbcommon_get_icon_for_name("gnomebaker-48", 48);
+     /* I think they changed the api between 0.3.0 and 0.3.1+ */
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch
new file mode 100644
index 000000000000..c0e29e66ad34
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch
@@ -0,0 +1,8 @@
+--- a/gnomebaker.desktop.in
++++ b/gnomebaker.desktop.in
+@@ -17,4 +17,4 @@ X-MultipleArgs=false
+ Type=Application
+ Categories=AudioVideo;DiscBurning;
+ StartupNotify=true
+-
++MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch
new file mode 100644
index 000000000000..0be6f1e09c43
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch
@@ -0,0 +1,31 @@
+--- a/src/filebrowser.c
++++ b/src/filebrowser.c	
+@@ -866,7 +866,7 @@ filebrowser_get_selection(gboolean from_
+     else
+         tree = glade_xml_get_widget(gnomebaker_getxml(), widget_browser_filelist);
+ 
+-    GtkSelectionData *selection_data = g_new0(GtkSelectionData, 1);
++    GtkSelectionData *selection_data = g_slice_new0(GtkSelectionData);
+     filebrowser_on_drag_data_get(tree, NULL, selection_data, 0, 0, NULL);
+     return selection_data;
+ }
+--- a/src/gnomebaker.c
++++ b/src/gnomebaker.c
+@@ -529,7 +529,7 @@ gnomebaker_on_add_files(gpointer widget,
+         }
+ 
+         /*gtk_selection_data_set_uris(selection_data, uris);*/
+-        selection_data = g_new0(GtkSelectionData, 1);
++        selection_data = g_slice_new0(GtkSelectionData);
+         gtk_selection_data_set(selection_data, selection_data->target, 8,
+                 (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
+         GB_TRACE("gnomebaker_on_add_files - [%s]\n", selection_data->data);
+@@ -1073,7 +1073,7 @@ gnomebaker_select_files_or_folders(const
+         }
+ 
+         /*gtk_selection_data_set_uris(selection_data, uris);*/
+-        selection_data = g_new0(GtkSelectionData, 1);
++        selection_data = g_slice_new0(GtkSelectionData);
+         gtk_selection_data_set(selection_data, selection_data->target, 8,
+             (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
+         GB_TRACE("gnomebaker_select_files_or_folders - [%s]\n", selection_data->data);
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..9a9f805ff0db
--- /dev/null
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+GCONF_DEBUG=no
+inherit eutils gnome2
+
+DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application"
+HOMEPAGE="http://sourceforge.net/projects/gnomebaker"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
+IUSE="dvdr flac libnotify mp3 vorbis"
+
+COMMON_DEPEND="app-cdr/cdrdao
+	dev-libs/libxml2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	>=media-libs/gstreamer-0.10:0.10
+	virtual/cdrtools
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	dvdr? ( app-cdr/dvd+rw-tools )
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-0.10:0.10
+	flac? ( >=media-plugins/gst-plugins-flac-0.10:0.10 )
+	mp3? ( >=media-plugins/gst-plugins-mad-0.10:0.10 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10:0.10 )"
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	G2CONF="$(use_enable libnotify)"
+
+	epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ldadd.patch \
+		"${FILESDIR}"/${P}-seldata.patch \
+		"${FILESDIR}"/${P}-mimetype.patch \
+		"${FILESDIR}"/${P}-implicits.patch
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install \
+		gnomebakerdocdir=/usr/share/doc/${P} \
+		docdir=/usr/share/gnome/help/${PN}/C \
+		gnomemenudir=/usr/share/applications
+
+	rm -rf "${ED}"/usr/share/doc/${P}/*.make "${ED}"/var
+}
diff --git a/app-cdr/gnomebaker/metadata.xml b/app-cdr/gnomebaker/metadata.xml
new file mode 100644
index 000000000000..ffe73314bd8c
--- /dev/null
+++ b/app-cdr/gnomebaker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnomebaker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
new file mode 100644
index 000000000000..92cab9bc9ab6
--- /dev/null
+++ b/app-cdr/graveman/Manifest
@@ -0,0 +1 @@
+DIST graveman-0.3.12-5.tar.gz 962523 SHA256 c55a4b7b2bd0788f98ed39d752a38af522e8a5bce8bea45ce5455e4c3444a696 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4 WHIRLPOOL 967e341f2b656ef872ada0f918a43a581ecedc7110481c49c912461ab8c7445837aad51a30c9ff220dfbf0f06f1872a90ea666cd88c6e6d937fcb4408a291b2a
diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch
new file mode 100644
index 000000000000..4a683d2c84ec
--- /dev/null
+++ b/app-cdr/graveman/files/desktop-entry.patch
@@ -0,0 +1,17 @@
+diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in
+--- graveman-0.3.12-5.orig/desktop/graveman.desktop.in	2005-05-24 00:07:08.000000000 +0300
++++ graveman-0.3.12-5/desktop/graveman.desktop.in	2008-05-10 06:33:32.000000000 +0300
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Graveman
+ Name[cs]=Graveman
+ Name[de]=Graveman
+@@ -48,5 +47,5 @@
+ Exec=graveman
+ Terminal=false
+ Type=Application
+-Icon=graveman48.png
+-Categories=Application;Utility;
++Icon=graveman48
++Categories=Utility;
diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch
new file mode 100644
index 000000000000..31517d6fc782
--- /dev/null
+++ b/app-cdr/graveman/files/joliet-long.patch
@@ -0,0 +1,18 @@
+--- src/mkisofs.c.old	2005-05-28 02:37:14.000000000 +0200
++++ src/mkisofs.c	2005-07-11 02:10:44.000000000 +0200
+@@ -91,13 +91,13 @@
+       }
+     }
+ 
+-    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
++    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J -joliet-long" : "", Lisolevel,
+         Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lmediainfo && Ldevchar ? "-M " : "",
+         Lmediainfo && Ldevchar ? Ldevchar : "");
+     g_free(Lmediainfo);
+     g_free(Lisolevel);
+   } else {  /* data dvd */
+-    Lextra = g_strdup("-r -J");
++    Lextra = g_strdup("-r -J -joliet-long");
+   }
+ 
+   /* charsets a utiliser pour la creation de l'image iso */
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch
new file mode 100644
index 000000000000..6be526d0c7df
--- /dev/null
+++ b/app-cdr/graveman/files/rename.patch
@@ -0,0 +1,11 @@
+--- src/callbacks.c.old	2006-05-23 17:42:48.642913000 +0200
++++ src/callbacks.c	2006-05-23 17:42:52.553201500 +0200
+@@ -268,7 +268,7 @@
+ 
+   gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1);
+ 
+-  Ltitle = g_strdup_printf(Ltitle, _("Enter the new name for %s"), Lname);
++  Ltitle = g_strdup_printf(_("Enter the new name for %s"), Lname);
+  
+   Lboite = gtk_dialog_new_with_buttons(Ltitle, NULL, GTK_DIALOG_MODAL,
+         GTK_STOCK_OK,GTK_RESPONSE_OK, GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, NULL);
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch
new file mode 100644
index 000000000000..f283337b02f3
--- /dev/null
+++ b/app-cdr/graveman/files/sox.patch
@@ -0,0 +1,38 @@
+diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
+--- a/graveman-0.3.12-5/src/sox.c	2005-05-28 02:37:14.000000000 +0200
++++ b/graveman-0.3.12-5/src/sox.c	2007-01-27 18:22:11.000000000 +0100
+@@ -37,7 +37,7 @@
+ gboolean check_sox()
+ {
+   gchar *Lsox = conf_get_string("sox");
+-  gchar *Lcommandline, *Lerr = NULL;
++  gchar *Lcommandline, *Lerr = NULL, *Lstdout = NULL;
+   gboolean Lstatus;
+   gint Lexit = 0;
+ 
+@@ -47,12 +47,22 @@
+   if (!Lsox || !*Lsox) return FALSE;
+ 
+   Lcommandline = g_strdup_printf("%s -help", conf_get_string("sox"));
+-  Lstatus = g_spawn_command_line_sync(Lcommandline, NULL, &Lerr, &Lexit, NULL);
++  Lstatus = g_spawn_command_line_sync(Lcommandline, &Lstdout, &Lerr, &Lexit, NULL);
+   g_free(Lcommandline);
+ 
+-  GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
+-  GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  /* sox 12.17 outputs -help to stderr */ 
++  if (Lerr && strstr(Lerr, "12.17")) {
++	GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
++  }
++
++  /* sox 12.18 outputs -help to stdout */
++  else {
++	GsupportMp3 = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_MP3))));
++	GsupportOgg = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_OGG))));
++  }
+   
++  g_free(Lstdout);
+   g_free(Lerr);
+ 
+   return Lstatus;
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
new file mode 100644
index 000000000000..374136100df0
--- /dev/null
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
+HOMEPAGE="http://graveman.tuxfamily.org/"
+SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="debug dvdr flac mp3 nls vorbis"
+
+RDEPEND="
+	app-cdr/cdrdao
+	>=dev-libs/glib-2.4:2
+	>=gnome-base/libglade-2.4:2.0
+	media-libs/libmng
+	virtual/cdrtools
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.4:2
+	dvdr? ( app-cdr/dvd+rw-tools )
+	flac? ( media-libs/flac )
+	mp3? ( 	media-libs/libid3tag
+		media-libs/libmad
+		media-sound/sox )
+	nls? ( virtual/libintl )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-sound/sox )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${P/_p/-}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/joliet-long.patch \
+		"${FILESDIR}"/rename.patch \
+		"${FILESDIR}"/desktop-entry.patch
+
+	if use mp3 || use vorbis; then
+		epatch "${FILESDIR}"/sox.patch
+	fi
+
+	# Fix tests
+	echo glade/dialog_media.glade >> po/POTFILES.in
+	echo glade/window_welcome.glade >> po/POTFILES.in
+	echo src/flac.c >> po/POTFILES.in
+
+	eautoreconf # Needed for build only the needed translations
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable debug) \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg)
+}
diff --git a/app-cdr/graveman/metadata.xml b/app-cdr/graveman/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/graveman/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
new file mode 100644
index 000000000000..f620178be1c6
--- /dev/null
+++ b/app-cdr/gtkcdlabel/Manifest
@@ -0,0 +1,2 @@
+DIST gtkcdlabel-1.12.tar.bz2 30054 SHA256 a2db925b4b7afc748465257872ffa5e5a7ba0a1545244431247ce506d0999a6b SHA512 7723dc986b89d7f0a296305b5933718f694939a000c9a3bd5f32acb6fc7e541e6a005f8826710b87f27c08aa616be06d83ea1dc1dc51b05fe8b6a776fc780b8f WHIRLPOOL 025dbf468a65dd2f673d74d38524e7a589da7d9dc60772b0ff165eeb3a7b6a8e940b1d9a5cc790b83e44209b687c7b5817ffcc18f50fb1047f7f00138abc63a0
+DIST gtkcdlabel-1.14.tar.bz2 36397 SHA256 df3307744822cde89632da8a83bae7e8e7c3754ed4738cf559c4be14cc66c303 SHA512 35dde20c73a38cb1dc61b42a8f54cc78d7b3db90b88cbf45f48ccf5eabe95333c5f61f4e8cd77ac1fe4f9faeb55acf944df9fb8bf363343da5bad8cc81115c6e WHIRLPOOL 152b3c02e3ecf37a7d0bc1eaa4efec885c2721b05f73d3d4f4d2cc52d25d46aedce41f3be3c919256793fa25c6795c26fcde5b5e778959969d9dddecc98fcdbb
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
new file mode 100644
index 000000000000..e0abd64a7f1b
--- /dev/null
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+inherit python
+
+DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers"
+HOMEPAGE="http://gtkcdlabel.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND=">=app-cdr/cdlabelgen-3
+	dev-python/pygtk"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
+src_install() {
+	dobin usr/bin/${PN}.py || die "dobin failed"
+	insinto /usr/share
+	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
+	dodoc usr/share/doc/${PN}/{AUTHORS,README}
+}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
new file mode 100644
index 000000000000..95d8612e33bf
--- /dev/null
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.14-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers"
+HOMEPAGE="http://gtkcdlabel.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	>=app-cdr/cdlabelgen-4
+	dev-python/pygtk[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_prepare() {
+	python_fix_shebang .
+}
+
+src_install() {
+	dobin usr/bin/${PN}.py || die "dobin failed"
+	insinto /usr/share
+	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
+	dodoc usr/share/doc/${PN}/{AUTHORS,README}
+}
diff --git a/app-cdr/gtkcdlabel/metadata.xml b/app-cdr/gtkcdlabel/metadata.xml
new file mode 100644
index 000000000000..37d0a75406c0
--- /dev/null
+++ b/app-cdr/gtkcdlabel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">gtkcdlabel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/iat/Manifest b/app-cdr/iat/Manifest
new file mode 100644
index 000000000000..75f86e3a316e
--- /dev/null
+++ b/app-cdr/iat/Manifest
@@ -0,0 +1 @@
+DIST iat-0.1.7.tar.bz2 103750 SHA256 fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca SHA512 ecde86ae11a9d88f7fa05c3b803941f6e5fad6f3dd14dc094145aa809fe9a15f7b410dae7b81715147c92309b618b8b62975ee193b73f38250b4403a6dd55eb4 WHIRLPOOL 879dfcb836a08bcd75874ea34e90c2c567ed88e696953edbb0154c90781f8a16ebca111585049862efa00dd571a4098acd8c9a5b925b06b9f78ae066509a3230
diff --git a/app-cdr/iat/iat-0.1.7-r1.ebuild b/app-cdr/iat/iat-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..96b842018d67
--- /dev/null
+++ b/app-cdr/iat/iat-0.1.7-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters"
+HOMEPAGE="http://iat.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+src_configure() {
+	econf  \
+		--disable-dependency-tracking \
+		--includedir=/usr/include/${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS README || die "dodoc failed"
+}
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/iat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
new file mode 100644
index 000000000000..f0c767ee21d4
--- /dev/null
+++ b/app-cdr/isomaster/Manifest
@@ -0,0 +1,4 @@
+DIST isomaster-1.3.11.tar.bz2 232153 SHA256 ab8c334d6df1996fc1872affc01e82aa3917b9d3ae37300e41491b7b2666b857 SHA512 98c654c9320410765f5d7656396b3d87c34505410638c01e3ae65b89a20eb19d6554a70c3deca79e39524459e3cce618be3e42fdce8b5de1d88fa72fa6e122d9 WHIRLPOOL e5e57fd99a09df55938805141d57dab5af163f413c8d6816bf9702f7fedd54d38021e0ddd1125093bcd764381e84f7f99cae5b07b07249b785299cf038cf4449
+DIST isomaster-1.3.13.tar.bz2 245085 SHA256 b700d10f1de240fe385e4294205e6cf5e51c0552f72efe26ae4a112a374a9e18 SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba WHIRLPOOL 6315bba9b76e743c064c86adba4c06ab31b1aea115af4c93df1908648a3a70b28fee3d16105c2601913abadf9cfdb267d08997c731d3c310e47f9a8ed33ec90a
+DIST isomaster-1.3.5.tar.bz2 196042 SHA256 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597 SHA512 25ef3a8e4a381100ea8c1aa913f7ec28dc8b7c2c0f8bfa1cdcda529d69a76b7d8baf35ca3dfa087b7210f3ad53f340259717c099c188386b511e641a358aac93 WHIRLPOOL f08657b60f4d2ca7df6d531dc5d744faf69b79e3ec83fcf5cc23640e0581cb3f16317a8a659f6e9903b2392a58262c4d7732d3ba0e9a0ec90fb4ce77da156e30
+DIST isomaster-1.3.9.tar.bz2 223514 SHA256 2bf798a19af43113391144c4a3f2f3b33366f640c5695d356c151e83c49dc853 SHA512 746f8e67fc5ebf39caaf1900c55752c07761cf919f49b49fdbf449b0c1309445c01b38d57cd5b741c057dd8d020d941863d2b29c1d5a725078cf8448d3ff8a4b WHIRLPOOL 92159a394ca99ca4ec079dddff21ed6a0a298ab0c393c54e31a81ea0b66cf77957c5c7edf498cbfc6f01f49512baa498d3810aee56d07b71d0333c580014d25e
diff --git a/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch b/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
new file mode 100644
index 000000000000..90ebe346a0c0
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.11-make-install.patch
@@ -0,0 +1,34 @@
+From 5717fb2da383d0c8c80fffdbe3ced568b2151f86 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 29 May 2014 18:58:48 +0200
+Subject: [PATCH] Fix "make install"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[..]
+for FILE in bkisofs-manual/manual/*html; do \
+            install -m 644 $FILE DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs; \
+        done;
+install: cannot create regular file ‘DESTDIR/usr/share/doc/isomaster-1.3.11/bkisofs’: No such file or directory
+[..]
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 116b2fd..fa4989e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -129,7 +129,7 @@ endif
+ 	$(INSTALL) -m 644 isomaster.1 $(DESTDIR)$(MYMANPATH)
+ 	$(INSTALL) -d $(DESTDIR)$(DESKTOPPATH)
+ 	$(INSTALL) -m 644 isomaster.desktop $(DESTDIR)$(DESKTOPPATH)
+-	#$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
++	$(INSTALL) -d $(DESTDIR)$(MYDOCPATH)
+ 	for FILE in bkisofs-manual/manual/*html; do \
+             $(INSTALL) -m 644 $$FILE $(DESTDIR)$(MYDOCPATH); \
+         done;
+-- 
+1.9.3
+
diff --git a/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
new file mode 100644
index 000000000000..8f328912552d
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.5-ldflags.diff
@@ -0,0 +1,11 @@
+--- Makefile
++++ Makefile
+@@ -64,7 +64,7 @@
+ 
+ isomaster: $(OBJECTS) lib iniparser
+ 	@echo 'Linking isomaster'
+-	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
++	@$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster
+ 
+ # static pattern rule
+ $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
new file mode 100644
index 000000000000..102f54db4a1a
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.9-asneeded.patch
@@ -0,0 +1,14 @@
+--- Makefile
++++ Makefile
+@@ -75,9 +75,9 @@
+ isomaster: $(OBJECTS) lib iniparser
+ 	@echo 'Linking isomaster'
+ ifndef USE_SYSTEM_INIPARSER
+-	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster
++	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` 
+ else
+-	@$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster
++	@$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0`
+ endif
+ 
+ # static pattern rule
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
new file mode 100644
index 000000000000..902028a660a2
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
@@ -0,0 +1,24 @@
+From d2cea534819267e9e8b7348b7cf6fdbad72c7b11 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 21 Jan 2012 21:34:33 +0100
+Subject: [PATCH] Fix compilation against iniparser 3.0.0 (bug #399629)
+
+---
+ Makefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3f4b383..43187fc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,6 +66,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+ ifdef USE_SYSTEM_INIPARSER
+ CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
++CPPFLAGS += -Diniparser_setstr=iniparser_set  # Define went away with iniparser 3.0.0, Gentoo bug #399629
+ endif
+ 
+ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
+-- 
+1.7.8.4
+
diff --git a/app-cdr/isomaster/isomaster-1.3.11.ebuild b/app-cdr/isomaster/isomaster-1.3.11.ebuild
new file mode 100644
index 000000000000..ef0ccfe60b57
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils fdo-mime toolchain-funcs
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/iniparser-3.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
+
+pkg_setup() {
+	myisoconf=(
+		DEFAULT_EDITOR=leafpad
+		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
+		USE_SYSTEM_INIPARSER=1
+		PREFIX=/usr
+		)
+
+	use nls || myisoconf+=( WITHOUT_NLS=1 )
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-install.patch
+	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
+	rm -R iniparser-2.17 || die
+}
+
+src_configure() { :; } #274361
+
+src_compile() {
+	tc-export CC
+	emake "${myisoconf[@]}"
+}
+
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale || die
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	use nls && _apply_linguas  # bug 402679, bug 512448
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
new file mode 100644
index 000000000000..02e97af6506f
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils fdo-mime toolchain-funcs
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/iniparser-3.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
+
+pkg_setup() {
+	myisoconf=(
+		DEFAULT_EDITOR=leafpad
+		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
+		USE_SYSTEM_INIPARSER=1
+		PREFIX=/usr
+		)
+
+	use nls || myisoconf+=( WITHOUT_NLS=1 )
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
+	rm -R iniparser-2.17 || die
+}
+
+src_configure() { :; } #274361
+
+src_compile() {
+	tc-export CC
+	emake "${myisoconf[@]}"
+}
+
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale || die
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	use nls && _apply_linguas  # bug 402679, bug 512448
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/isomaster/isomaster-1.3.5.ebuild b/app-cdr/isomaster/isomaster-1.3.5.ebuild
new file mode 100644
index 000000000000..eb0b16c43620
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.diff
+}
+
+src_configure() { :; }
+
+src_compile() {
+	tc-export CC
+	emake PREFIX="/usr" || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "emake install failed"
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT
+}
diff --git a/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..53b94bd74dd8
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils fdo-mime toolchain-funcs
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/iniparser-3.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	myisoconf=(
+		DEFAULT_EDITOR=leafpad
+		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
+		USE_SYSTEM_INIPARSER=1
+		PREFIX=/usr
+		)
+
+	use nls || myisoconf+=( WITHOUT_NLS=1 )
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-iniparser-3.0.0.patch #399629
+	rm -R iniparser-2.17 || die
+}
+
+src_configure() { :; } #274361
+
+src_compile() {
+	tc-export CC
+	emake "${myisoconf[@]}"
+}
+
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale || die
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	_apply_linguas  # bug 402679
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml
new file mode 100644
index 000000000000..588a5b809eff
--- /dev/null
+++ b/app-cdr/isomaster/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
new file mode 100644
index 000000000000..dd6becef89b3
--- /dev/null
+++ b/app-cdr/k3b/Manifest
@@ -0,0 +1 @@
+DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50
diff --git a/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch b/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch
new file mode 100644
index 000000000000..9c5ac4205f79
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.3-libav-11.patch
@@ -0,0 +1,138 @@
+From 52d3d64863d2fab4128f524870851f18f5cae1fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
+Date: Sat, 14 Feb 2015 15:31:07 +0100
+Subject: [PATCH] Fixed compilation with newer ffmpeg/libav.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 60 ++++++++++++++++++++++++-----
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 5451fd3..2f80fd6 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -86,8 +86,12 @@ public:
+     K3b::Msf length;
+ 
+     // for decoding. ffmpeg requires 16-byte alignment.
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++    ::AVFrame* frame;
++#else
+     char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15];
+     char* alignedOutputBuffer;
++#endif
+     char* outputBufferPos;
+     int outputBufferSize;
+     ::AVPacket packet;
+@@ -102,14 +106,29 @@ K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
+     d = new Private;
+     d->formatContext = 0;
+     d->codec = 0;
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
++    d->frame = avcodec_alloc_frame();
++#  else
++    d->frame = av_frame_alloc();
++#  endif
++#else
+     int offset = 0x10 - (reinterpret_cast<intptr_t>(&d->outputBuffer) & 0xf);
+     d->alignedOutputBuffer = &d->outputBuffer[offset];
++#endif
+ }
+ 
+ 
+ K3bFFMpegFile::~K3bFFMpegFile()
+ {
+     close();
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++#  if LIBAVCODEC_BUILD < AV_VERSION_INT(55,28,1)
++    av_free(d->frame);
++#  else
++    av_frame_free(&d->frame);
++#  endif
++#endif
+     delete d;
+ }
+ 
+@@ -326,26 +345,36 @@ int K3bFFMpegFile::fillOutputBuffer()
+             return 0;
+         }
+ 
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++        int gotFrame = 0;
++        int len = ::avcodec_decode_audio4(
++#else
+         d->outputBufferPos = d->alignedOutputBuffer;
+         d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-
+-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
++#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+         int len = ::avcodec_decode_audio3(
+-#else
+-#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
+-        int len = ::avcodec_decode_audio2(
+ #  else
++#    ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO2
++        int len = ::avcodec_decode_audio2(
++#    else
+         int len = ::avcodec_decode_audio(
++#    endif
+ #  endif
+ #endif
+ 
+             FFMPEG_CODEC(d->formatContext->streams[0]),
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++            d->frame,
++            &gotFrame,
++            &d->packet );
++#else
+             (short*)d->alignedOutputBuffer,
+             &d->outputBufferSize,
+-#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
++#  ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO3
+             &d->packet );
+-#else
++#  else
+             d->packetData, d->packetSize );
++#  endif
+ #endif
+ 
+         if( d->packetSize <= 0 || len < 0 )
+@@ -355,6 +384,17 @@ int K3bFFMpegFile::fillOutputBuffer()
+             return -1;
+         }
+ 
++#ifdef HAVE_FFMPEG_AVCODEC_DECODE_AUDIO4
++        if ( gotFrame ) {
++            d->outputBufferSize = ::av_samples_get_buffer_size(
++                NULL,
++                FFMPEG_CODEC(d->formatContext->streams[0])->channels,
++                d->frame->nb_samples,
++                FFMPEG_CODEC(d->formatContext->streams[0])->sample_fmt,
++                1 );
++            d->outputBufferPos = reinterpret_cast<char*>( d->frame->data[0] );
++        }
++#endif
+         d->packetSize -= len;
+         d->packetData += len;
+     }
+@@ -420,9 +460,9 @@ K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
+         // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do
+         // its thing.
+         //
+-        if( file->type() == CODEC_ID_WMAV1 ||
+-            file->type() == CODEC_ID_WMAV2 ||
+-            file->type() == CODEC_ID_AAC )
++        if( file->type() == AV_CODEC_ID_WMAV1 ||
++            file->type() == AV_CODEC_ID_WMAV2 ||
++            file->type() == AV_CODEC_ID_AAC )
+ #endif
+             return file;
+     }
+-- 
+2.0.5
+
diff --git a/app-cdr/k3b/k3b-2.0.3-r2.ebuild b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..68619e53c0a4
--- /dev/null
+++ b/app-cdr/k3b/k3b-2.0.3-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KDE_SCM="git"
+
+# Translations are not available, since this is a snapshot
+KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr
+ga gl he hi hne hr hu is it ja kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl
+pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk
+zh_CN zh_TW"
+
+SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz"
+DOCS=( FAQ PERMISSIONS README )
+
+inherit kde4-base
+
+DESCRIPTION="The CD/DVD Kreator for KDE"
+HOMEPAGE="http://www.k3b.org/"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
+
+CDEPEND="
+	$(add_kdeapps_dep libkcddb)
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	mp3? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
+	app-cdr/cdrdao
+	media-sound/cdparanoia
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-libav-11.patch"
+)
+
+REQUIRED_USE="
+	mp3? ( encode )
+	sox? ( encode )
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_K3BSETUP=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		$(cmake-utils_use debug K3B_DEBUG)
+		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
+		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
+		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
+		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
+		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+	)
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/app-cdr/k3b/metadata.xml b/app-cdr/k3b/metadata.xml
new file mode 100644
index 000000000000..faefd0ab4bb8
--- /dev/null
+++ b/app-cdr/k3b/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>media-optical</herd>
+	<use>
+		<flag name="emovix">Enable burning support for eMoviX images</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-cdr/k9copy/Manifest b/app-cdr/k9copy/Manifest
new file mode 100644
index 000000000000..7af6b54d6df1
--- /dev/null
+++ b/app-cdr/k9copy/Manifest
@@ -0,0 +1 @@
+DIST k9copy-2.3.8-Source.tar.gz 1589535 SHA256 cf5e2d9faf7821561e478ed1fc9b63bbcc3448405d7b7866f68b018d16b42fdf SHA512 b914e67040ad8abc0537dc8fc1e7d8cc0d6e8b1dae38dbde8dbadf6c0408b040582bac6c53129f26e520bfd106ad1ab8c9079efe12562438ff2dfcb11053fd0c WHIRLPOOL 476a76aedafc3a8f69f7a0dd91e90a8f27c6db8e6771827b9d2c5007fa94ba765d30d294ff5039a31322bb5bb7465c771185dc23eb25b17c674773b2d4c28e10
diff --git a/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-0.11.patch b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..eb41fa03d84d
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-0.11.patch
@@ -0,0 +1,567 @@
+Fix build with ffmpeg-0.11 and later.
+
+From slackware:
+http://www.slackware.org.uk/slackbuilds.org/14.0/multimedia/k9copy/
+https://bugs.gentoo.org/show_bug.cgi?id=459980
+
+diff -Nru k9copy-2.3.8-Source.orig/CMakeLists.txt k9copy-2.3.8-Source/CMakeLists.txt
+--- k9copy-2.3.8-Source.orig/CMakeLists.txt	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/CMakeLists.txt	2012-11-23 10:12:56.000000000 +0100
+@@ -18,6 +18,7 @@
+ INCLUDE(FindXine)
+ INCLUDE(FindAvcodec)
+ INCLUDE(FindAvformat)
++INCLUDE(FindAvutil)
+ INCLUDE(FindFFmpegScale)
+ #INCLUDE(FindLibDvdread)
+ 
+@@ -68,6 +69,7 @@
+ 
+ FINDAVFORMAT("avformat")
+ FINDAVCODEC("avcodec")
++FINDAVUTIL("avutil")
+ 
+ add_definitions( -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS)
+ add_subdirectory( src/dvdnav)
+@@ -103,6 +105,7 @@
+ #${LIBDVDREAD_INCLUDE_DIR}/dvdread
+  ${AVCODEC_INCLUDE_DIR}
+  ${AVFORMAT_INCLUDE_DIR}
++ ${AVUTIL_INCLUDE_DIR}
+  ${FFMPEGSCALE_INCLUDE_DIR}
+  ${FFMPEG_INCLUDE_DIR}
+ )
+diff -Nru k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake k9copy-2.3.8-Source/cmake/FindAvutil.cmake
+--- k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake	1970-01-01 01:00:00.000000000 +0100
++++ k9copy-2.3.8-Source/cmake/FindAvutil.cmake	2012-11-23 10:12:56.000000000 +0100
+@@ -0,0 +1,35 @@
++MACRO (FINDAVUTIL _lib)
++
++FIND_PATH(AVUTIL_INCLUDE_DIR_FF "ffmpeg/avutil.h" PATHS)
++IF (AVUTIL_INCLUDE_DIR_FF)
++      SET (AVUTIL_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg")
++ELSE (AVUTIL_INCLUDE_DIR_FF)
++      FIND_PATH(AVUTIL_INCLUDE_DIR_LAVC "libavutil/avutil.h" PATHS)
++      IF (AVUTIL_INCLUDE_DIR_LAVC)
++          SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}/libavutil")
++      ELSE (AVUTIL_INCLUDE_DIR_LAVC)
++	  FIND_PATH(AVUTIL_INCLUDE_DIR_FF_LAVF "ffmpeg/libavutil/avutil.h" PATHS)
++	  IF (AVUTIL_INCLUDE_DIR_FF_LAVF)
++	    SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavutil")
++	  ENDIF (AVUTIL_INCLUDE_DIR_FF_LAVF)
++      ENDIF (AVUTIL_INCLUDE_DIR_LAVC)
++ENDIF (AVUTIL_INCLUDE_DIR_FF)
++
++
++
++FIND_LIBRARY(AVUTIL_LIBRARY NAMES ${_lib} PATHS ) 
++
++IF (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
++   SET(INC_FOUND TRUE)
++ELSE (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
++      SET(INC_FOUND FALSE)
++ENDIF (AVUTIL_INCLUDE_DIR AND AVUTIL_LIBRARY)
++
++
++IF (INC_FOUND)
++      MESSAGE(STATUS "Found include avutil.h: ${AVUTIL_INCLUDE_DIR}")
++      MESSAGE(STATUS "Found library ${_lib}: ${AVUTIL_LIBRARY}")
++ELSE (INC_FOUND)
++      MESSAGE(FATAL_ERROR "Could not find ${_lib}")
++ENDIF (INC_FOUND)
++ENDMACRO (FINDAVUTIL _lib )
+\ No newline at end of file
+diff -Nru k9copy-2.3.8-Source.orig/src/backup/k9mp4enc.cpp k9copy-2.3.8-Source/src/backup/k9mp4enc.cpp
+--- k9copy-2.3.8-Source.orig/src/backup/k9mp4enc.cpp	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/src/backup/k9mp4enc.cpp	2012-12-11 09:37:02.558323776 +0100
+@@ -619,7 +619,7 @@
+         //      cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
+     }
+     //synchronize audio
+-    cmd << "-async" << "1" ;
++    cmd << "-async" << "44100" ;
+     cmd << "-y"  << KShell::quoteArg(path);
+     cmd << slNewAudio;
+ //    if (m_extractMkv) {
+diff -Nru k9copy-2.3.8-Source.orig/src/core/k9audiocodecs.cpp k9copy-2.3.8-Source/src/core/k9audiocodecs.cpp
+--- k9copy-2.3.8-Source.orig/src/core/k9audiocodecs.cpp	2011-12-09 22:08:42.000000000 +0100
++++ k9copy-2.3.8-Source/src/core/k9audiocodecs.cpp	2012-12-11 09:37:02.584323452 +0100
+@@ -75,10 +75,10 @@
+     m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");
+     m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");
+     m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");
+-    m_codecs[7]=_k9AudioCodec("copy","-acodec copy","ffmpeg","");
+-    m_codecs[8]=_k9AudioCodec("mp3","-acodec libmp3lame -ab $AUDBRk -ac 2","ffmpeg",".mp3");
+-    m_codecs[9]=_k9AudioCodec("vorbis","-acodec vorbis -ab $AUDBRk -ac 2","ffmpeg",".ogg");
+-    m_codecs[10]=_k9AudioCodec("aac","-acodec libfaac -ab $AUDBRk -ac 2","ffmpeg",".aac");
++    m_codecs[7]=_k9AudioCodec("copy","-codec:a copy","ffmpeg","");
++    m_codecs[8]=_k9AudioCodec("mp3","-codec:a libmp3lame -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".mp3");
++    m_codecs[9]=_k9AudioCodec("vorbis","-codec:a vorbis -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".ogg");
++    m_codecs[10]=_k9AudioCodec("aac","-codec:a libfaac -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".aac");
+ 
+     save();
+ }
+diff -Nru k9copy-2.3.8-Source.orig/src/core/k9videocodecs.cpp k9copy-2.3.8-Source/src/core/k9videocodecs.cpp
+--- k9copy-2.3.8-Source.orig/src/core/k9videocodecs.cpp	2011-12-09 22:08:42.000000000 +0100
++++ k9copy-2.3.8-Source/src/core/k9videocodecs.cpp	2012-12-11 09:37:02.607323163 +0100
+@@ -98,12 +98,12 @@
+       m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+       m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+       m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+-      m_codecs[21]=_k9VideoCodec("copy","","-vcodec copy","-vcodec copy","-vcodec copy","ffmpeg");
+-      m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
+-      m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4  -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+-      m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
++      m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
++      m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4  -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++      m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+ 
+       save();
+ 
+diff -Nru k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp k9copy-2.3.8-Source/src/import/k9avidecode.cpp
+--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/src/import/k9avidecode.cpp	2012-11-23 10:12:56.000000000 +0100
+@@ -37,11 +37,13 @@
+         : QObject(parent) {
+     CodecHandle=0;
+     FormatHandle=0;
++    UtilHandle=0;
+     SwscaleHandle=0;
+     glibref=0;
+     if (glibref==0) {
+         CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
+         FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
++        UtilHandle=dlopen("libavutil.so",RTLD_LAZY);
+ #ifdef HAVE_SWSCALE
+         SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
+         if (SwscaleHandle==0)
+@@ -56,6 +58,12 @@
+     if (!FormatHandle ) {
+         errs << i18n("Cannot open the library %1").arg("libavformat");
+     }
++#   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++    if (!UtilHandle) {
++        m_error =i18n("Cannot open then library %1").arg("libavutil");
++        return;
++    }
++#   endif
+ #ifdef HAVE_SWSCALE
+     if (!SwscaleHandle) {
+         errs << i18n("Cannot open the library %1").arg("libswscale");
+@@ -63,17 +71,32 @@
+ #endif
+ 
+     av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
++#   else
+     av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
++#   else
+     av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
++#   endif
+     avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
++#   else
+     avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
++#   endif
+     avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
+     avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
+     av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
+     avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
+     av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
++#   else
+     avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
+-    if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
++#   endif
+ #ifndef HAVE_SWSCALE
+     img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
+ //if img_convert is null (deprecated in ffmpeg), we need libswscale
+@@ -85,7 +108,11 @@
+     if (av_free_packet==0)
+          av_free_packet=av_free_packet_internal;
+     avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
++#   else
+     av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
++#   endif
+     av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
+     av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
+     avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
+@@ -94,7 +121,11 @@
+     sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
+     sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
+ #endif
++#   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++    av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
++#   else
+     av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
++#   endif
+     
+     if (errs.count() >0) {
+         m_error=errs.join("\n");
+@@ -118,6 +149,8 @@
+         	dlclose(FormatHandle);
+ 	if (CodecHandle)
+         	dlclose(CodecHandle);
++    if(UtilHandle)
++            dlclose(UtilHandle);
+ #ifdef HAVE_SWSCALE
+ 	if (SwscaleHandle)
+         	dlclose(CodecHandle);
+@@ -134,12 +167,24 @@
+         close();
+ 
+     // Open video file
+-    if (av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0) {
++    if (
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++        avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), 0, 0)!=0
++#       else
++        av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
++#       endif
++       ) {
+         m_error=i18n("Couldn't open the file %1").arg(_fileName);
+         return false; // Couldn't open file}
+     }
+ // Retrieve stream information
+-    if (av_find_stream_info(m_FormatCtx)<0) {
++    if (
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++        avformat_find_stream_info(m_FormatCtx, NULL)<0
++#       else
++        av_find_stream_info(m_FormatCtx)<0
++#       endif
++       ) {
+         m_error =i18n("Couldn't find stream information");
+         return false; // Couldn't find stream information
+     }
+@@ -168,7 +213,13 @@
+         return false; // Codec not found
+     }
+ // Open codec
+-    if (avcodec_open(m_CodecCtx, m_Codec)<0) {
++    if (
++#       if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++        avcodec_open2(m_CodecCtx, m_Codec, NULL)<0
++#       else
++        avcodec_open(m_CodecCtx, m_Codec)<0
++#       endif
++       ) {
+         m_error =i18n("Could'nt open the codec");
+         return false; // Could not open codec
+     }
+@@ -245,15 +296,23 @@
+         // Is this a packet from the video stream?
+         if (packet.stream_index==m_videoStream) {
+             // Decode video frame
++#           if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++            avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, &packet);
++#           else
+             avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+                                  packet.data, packet.size);
++#           endif
+ 
+             // Did we get a video frame?
+             if (frameFinished) {
+ //            if (m_Frame->pts >=fspos)
+ 		int64_t cur_dts=fspos;
+-		if (m_FormatCtx->cur_st)
+-		    cur_dts=	m_FormatCtx->cur_st->cur_dts;
++#               if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
++		cur_dts=	packet.dts;
++#               else
++ 		if (m_FormatCtx->cur_st)
++ 		    cur_dts=	m_FormatCtx->cur_st->cur_dts;
++#               endif
+                 if (cur_dts >=fspos) {
+                     bFound=true;
+ #ifndef HAVE_SWSCALE
+@@ -309,7 +368,11 @@
+         avcodec_close(m_CodecCtx);
+ 
+         // Close the video file
++#       if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++        avformat_close_input(&m_FormatCtx);
++#       else
+         av_close_input_file(m_FormatCtx);
++#       endif
+         m_opened=false;
+     }
+ }
+diff -Nru k9copy-2.3.8-Source.orig/src/import/k9avidecode.h k9copy-2.3.8-Source/src/import/k9avidecode.h
+--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.h	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/src/import/k9avidecode.h	2012-11-23 10:12:56.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include "k9common.h"
+ #include <qobject.h>
+ #include <avformat.h>
++#include <avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+@@ -29,10 +30,22 @@
+ //typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
+ typedef void (*av_register_all_t) (void);
+ typedef int64_t (*av_gettime_t) (void);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
++#else
+ typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
++#endif
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
++#else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
++#endif
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
++#else
+ typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
++#endif
+ typedef AVFrame * (*avcodec_alloc_frame_t)(void);
+ 
+ typedef int (*avpicture_get_size_t)(int , int , int );
+@@ -40,11 +53,19 @@
+ typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
+ typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
++#else
+ typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
++#endif
+ typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
+ typedef void (*av_free_t)(void *);
+ typedef int (*avcodec_close_t)(AVCodecContext *);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++typedef void (*avformat_close_input_t)(AVFormatContext **);
++#else
+ typedef void (*av_close_input_file_t)(AVFormatContext *);
++#endif
+ typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); 		typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational )	;
+ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
+ typedef void (*av_free_packet_t)(AVPacket *);
+@@ -77,21 +98,41 @@
+ 	
+ private:
+     av_register_all_t av_register_all;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input_t avformat_open_input;
++#   else
+     av_open_input_file_t av_open_input_file;
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info_t avformat_find_stream_info;
++#   else
+     av_find_stream_info_t av_find_stream_info;
++#   endif
+     avcodec_find_decoder_t avcodec_find_decoder;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2_t avcodec_open2;
++#   else
+     avcodec_open_t avcodec_open;
++#   endif
+     avcodec_alloc_frame_t avcodec_alloc_frame;
+     av_seek_frame_t av_seek_frame;
+     avpicture_get_size_t avpicture_get_size;
+     av_malloc_t av_malloc;
+     avpicture_fill_t avpicture_fill;
+     av_read_frame_t av_read_frame;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2_t avcodec_decode_video2;
++#   else
+     avcodec_decode_video_t avcodec_decode_video;
++#   endif
+     img_convert_t img_convert;
+     av_free_t av_free;
+     avcodec_close_t avcodec_close;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input_t avformat_close_input;
++#   else
+     av_close_input_file_t av_close_input_file;
++#   endif
+     av_rescale_q_t av_rescale_q;
+     av_gettime_t av_gettime;
+     avcodec_flush_buffers_t avcodec_flush_buffers;
+@@ -103,6 +144,7 @@
+ #endif
+     void *CodecHandle;
+     void *FormatHandle;
++    void *UtilHandle;
+     void *SwscaleHandle;
+     int glibref;
+ 
+diff -Nru k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
+--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp	2012-11-23 10:12:56.000000000 +0100
+@@ -50,20 +50,40 @@
+     avcodec_init =(avcodec_init_t)dlsym(CodecHandle,"avcodec_init");
+     av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
+     avcodec_alloc_context=(avcodec_alloc_context_t)dlsym(CodecHandle,"avcodec_alloc_context");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
++#   else
+     av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
++#   else
+     av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
++#   endif
+     avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
++#   else
+     avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
++#   endif
+     avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
+     avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
+     av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
+     avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
+     av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
++#   else
+     avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
++#   endif
+     img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
+     av_free = (av_free_t)dlsym(CodecHandle,"av_free");
+     avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
++#   else
+     av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
++#   endif
+     av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
+     av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
+     avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
+@@ -73,7 +93,11 @@
+     sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
+ #endif
+ 
++#   if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++    av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
++#   else
+     av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
++#   endif
+     url_fopen=(url_fopen_t)dlsym(FormatHandle,"url_fopen");
+ 
+     audio_resample_init=(audio_resample_init_t)dlsym(CodecHandle,"audio_resample_init");
+@@ -110,4 +134,4 @@
+ k9FFMpeg *k9FFMpeg::instance() {
+    return &_FFMpegInstance;
+ 
+-}
+\ No newline at end of file
++}
+diff -Nru k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
+--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h	2011-12-09 22:08:41.000000000 +0100
++++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h	2012-11-23 10:13:39.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include <QString>
+ #include <avcodec.h>
+ #include <avformat.h>
++#include <avutil.h>
+ #include <avio.h>
+ #ifdef HAVE_SWSCALE
+ #include <swscale.h>
+@@ -28,10 +29,22 @@
+ typedef void (*av_register_all_t) (void);
+ typedef void (*avcodec_init_t)(void);
+ typedef int64_t (*av_gettime_t) (void);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
++#else
+ typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
++#endif
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
++#else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
++#endif
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
++#else
+ typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
++#endif
+ typedef AVFrame * (*avcodec_alloc_frame_t)(void);
+ typedef AVCodecContext * (*avcodec_alloc_context_t)(void);
+ 
+@@ -40,13 +53,21 @@
+ typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
+ typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
++#else
+ typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
++#endif
+ typedef int (*avcodec_encode_audio_t)(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples);
+ 
+ typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
+ typedef void (*av_free_t)(void *);
+ typedef int (*avcodec_close_t)(AVCodecContext *);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++typedef void (*avformat_close_input_t)(AVFormatContext **);
++#else
+ typedef void (*av_close_input_file_t)(AVFormatContext *);
++#endif
+ typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); 		
+ typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational )	;
+ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
+@@ -89,21 +110,41 @@
+     avcodec_init_t avcodec_init;
+     avcodec_alloc_context_t avcodec_alloc_context;
+     av_register_all_t av_register_all;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++    avformat_open_input_t avformat_open_input;
++#   else
+     av_open_input_file_t av_open_input_file;
++#   endif
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++    avformat_find_stream_info_t avformat_find_stream_info;
++#   else
+     av_find_stream_info_t av_find_stream_info;
++#   endif
+     avcodec_find_decoder_t avcodec_find_decoder;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++    avcodec_open2_t avcodec_open2;
++#   else
+     avcodec_open_t avcodec_open;
++#   endif
+     avcodec_alloc_frame_t avcodec_alloc_frame;
+     av_seek_frame_t av_seek_frame;
+     avpicture_get_size_t avpicture_get_size;
+     av_malloc_t av_malloc;
+     avpicture_fill_t avpicture_fill;
+     av_read_frame_t av_read_frame;
++#   if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++    avcodec_decode_video2_t avcodec_decode_video2;
++#   else
+     avcodec_decode_video_t avcodec_decode_video;
++#   endif
+     img_convert_t img_convert;
+     av_free_t av_free;
+     avcodec_close_t avcodec_close;
++#   if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++    avformat_close_input_t avformat_close_input;
++#   else
+     av_close_input_file_t av_close_input_file;
++#   endif
+     av_rescale_q_t av_rescale_q;
+     av_gettime_t av_gettime;
+     avcodec_flush_buffers_t avcodec_flush_buffers;
diff --git a/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch
new file mode 100644
index 000000000000..5b84c247f8be
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.8-ffmpeg-2.1.patch
@@ -0,0 +1,20 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=505196
+
+Generated from: https://505196.bugs.gentoo.org/attachment.cgi?id=373958
+- Split out the existing two patches already applied in the ebuild.
+- Version check to keep compatibility with older ffmpeg.
+diff -u k9copy-2.3.8-Source/src/import/k9avidecode.h k9copy-2.3.8-Source/src/import/k9avidecode.h
+--- k9copy-2.3.8-Source/src/import/k9avidecode.h	2012-11-23 10:12:56.000000000 +0100
++++ k9copy-2.3.8-Source/src/import/k9avidecode.h	2014-03-31 07:47:35.119092120 +0100
+@@ -40,7 +40,11 @@
+ #else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
+ #endif
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#else
++typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
++#endif
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
+ #else
diff --git a/app-cdr/k9copy/files/k9copy-2.3.8-includepaths.patch b/app-cdr/k9copy/files/k9copy-2.3.8-includepaths.patch
new file mode 100644
index 000000000000..111b3d121561
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-2.3.8-includepaths.patch
@@ -0,0 +1,182 @@
+libavutil/time.h in recent ffmpeg versions pollute the includes.
+include libav* headers correcly.
+https://bugs.gentoo.org/show_bug.cgi?id=459980
+same as for backlite
+
+Index: k9copy-2.3.8-Source/cmake/FindAvcodec.cmake
+===================================================================
+--- k9copy-2.3.8-Source.orig/cmake/FindAvcodec.cmake
++++ k9copy-2.3.8-Source/cmake/FindAvcodec.cmake
+@@ -10,11 +10,11 @@ IF (AVCODEC_INCLUDE_DIR_FF)
+ ELSE (AVCODEC_INCLUDE_DIR_FF)
+       FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "libavcodec/avcodec.h" PATHS)
+       IF (AVCODEC_INCLUDE_DIR_LAVC)
+-          SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/libavcodec")
++          SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}")
+       ELSE (AVCODEC_INCLUDE_DIR_LAVC)
+ 	  FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg/libavcodec/avcodec.h" PATHS)
+ 	  IF (AVCODEC_INCLUDE_DIR_FF_LAVC)
+-	    SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg/libavcodec")
++	    SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg")
+ 	    SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg")
+ 	  ENDIF (AVCODEC_INCLUDE_DIR_FF_LAVC)
+       ENDIF (AVCODEC_INCLUDE_DIR_LAVC)
+@@ -35,4 +35,4 @@ IF (INC_FOUND)
+ ELSE (INC_FOUND)
+       MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (INC_FOUND)
+-ENDMACRO (FINDAVCODEC _lib )
+\ No newline at end of file
++ENDMACRO (FINDAVCODEC _lib )
+Index: k9copy-2.3.8-Source/cmake/FindAvformat.cmake
+===================================================================
+--- k9copy-2.3.8-Source.orig/cmake/FindAvformat.cmake
++++ k9copy-2.3.8-Source/cmake/FindAvformat.cmake
+@@ -6,11 +6,11 @@ IF (AVFORMAT_INCLUDE_DIR_FF)
+ ELSE (AVFORMAT_INCLUDE_DIR_FF)
+       FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS)
+       IF (AVFORMAT_INCLUDE_DIR_LAVC)
+-          SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat")
++          SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}")
+       ELSE (AVFORMAT_INCLUDE_DIR_LAVC)
+ 	  FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS)
+ 	  IF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
+-	    SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat")
++	    SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg")
+ 	  ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
+       ENDIF (AVFORMAT_INCLUDE_DIR_LAVC)
+ ENDIF (AVFORMAT_INCLUDE_DIR_FF)
+@@ -32,4 +32,4 @@ IF (INC_FOUND)
+ ELSE (INC_FOUND)
+       MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (INC_FOUND)
+-ENDMACRO (FINDAVFORMAT _lib )
+\ No newline at end of file
++ENDMACRO (FINDAVFORMAT _lib )
+Index: k9copy-2.3.8-Source/cmake/FindAvutil.cmake
+===================================================================
+--- k9copy-2.3.8-Source.orig/cmake/FindAvutil.cmake
++++ k9copy-2.3.8-Source/cmake/FindAvutil.cmake
+@@ -6,11 +6,11 @@ IF (AVUTIL_INCLUDE_DIR_FF)
+ ELSE (AVUTIL_INCLUDE_DIR_FF)
+       FIND_PATH(AVUTIL_INCLUDE_DIR_LAVC "libavutil/avutil.h" PATHS)
+       IF (AVUTIL_INCLUDE_DIR_LAVC)
+-          SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}/libavutil")
++          SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_LAVC}")
+       ELSE (AVUTIL_INCLUDE_DIR_LAVC)
+ 	  FIND_PATH(AVUTIL_INCLUDE_DIR_FF_LAVF "ffmpeg/libavutil/avutil.h" PATHS)
+ 	  IF (AVUTIL_INCLUDE_DIR_FF_LAVF)
+-	    SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavutil")
++	    SET (AVUTIL_INCLUDE_DIR "${AVUTIL_INCLUDE_DIR_FF_LAVF}/ffmpeg")
+ 	  ENDIF (AVUTIL_INCLUDE_DIR_FF_LAVF)
+       ENDIF (AVUTIL_INCLUDE_DIR_LAVC)
+ ENDIF (AVUTIL_INCLUDE_DIR_FF)
+@@ -32,4 +32,4 @@ IF (INC_FOUND)
+ ELSE (INC_FOUND)
+       MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (INC_FOUND)
+-ENDMACRO (FINDAVUTIL _lib )
+\ No newline at end of file
++ENDMACRO (FINDAVUTIL _lib )
+Index: k9copy-2.3.8-Source/cmake/FindFFmpegScale.cmake
+===================================================================
+--- k9copy-2.3.8-Source.orig/cmake/FindFFmpegScale.cmake
++++ k9copy-2.3.8-Source/cmake/FindFFmpegScale.cmake
+@@ -7,11 +7,11 @@ IF (FFMPEGSCALE_INCLUDE_DIR_FF)
+ ELSE (FFMPEGSCALE_INCLUDE_DIR_FF)
+       FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "libswscale/swscale.h" PATHS)
+       IF (FFMPEGSCALE_INCLUDE_DIR_LAVC)
+-          SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/libswscale")
++          SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}")
+       ELSE (FFMPEGSCALE_INCLUDE_DIR_LAVC)
+ 	  FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg/libswscale/swscale.h" PATHS)
+ 	  IF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL)
+-	    SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg/libswscale")
++	    SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg")
+ 	  ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL)
+       ENDIF (FFMPEGSCALE_INCLUDE_DIR_LAVC)
+ ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF)
+@@ -34,4 +34,4 @@ ELSE (HAVE_SWSCALE)
+       MESSAGE(STATUS "k9copy will be built without swscale support")
+       #MESSAGE(FATAL_ERROR "Could not find ${_lib}")
+ ENDIF (HAVE_SWSCALE)
+-ENDMACRO (FINDFFMPEGSCALE _lib )
+\ No newline at end of file
++ENDMACRO (FINDFFMPEGSCALE _lib )
+Index: k9copy-2.3.8-Source/src/import/k9avidecode.cpp
+===================================================================
+--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.cpp
++++ k9copy-2.3.8-Source/src/import/k9avidecode.cpp
+@@ -10,14 +10,14 @@
+ //
+ //
+ #include "k9avidecode.h"
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include <qimage.h>
+ #include <dlfcn.h>
+ #include "k9common.h"
+ 
+ #ifdef HAVE_SWSCALE
+ 
+-#include "swscale.h"
++#include <libswscale/swscale.h>
+ 
+ static int sws_flags = SWS_BICUBIC;
+ 
+Index: k9copy-2.3.8-Source/src/import/k9avidecode.h
+===================================================================
+--- k9copy-2.3.8-Source.orig/src/import/k9avidecode.h
++++ k9copy-2.3.8-Source/src/import/k9avidecode.h
+@@ -14,13 +14,13 @@
+ 
+ #include "k9common.h"
+ #include <qobject.h>
+-#include <avformat.h>
+-#include <avutil.h>
++#include <libavformat/avformat.h>
++#include <libavutil/avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+ #ifdef HAVE_SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ /**
+ 	@author Jean-Michel PETIT <k9copy@free.fr>
+Index: k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
+===================================================================
+--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.cpp
++++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.cpp
+@@ -12,7 +12,7 @@
+ #include "k9common.h"
+ #include "k9ffmpeg.h"
+ #ifdef HAVE_SWSCALE
+-#include "swscale.h"
++#include <libswscale/swscale.h>
+ #endif
+ #include <dlfcn.h>
+ #include <klocale.h>
+Index: k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
+===================================================================
+--- k9copy-2.3.8-Source.orig/src/vamps/k9ffmpeg.h
++++ k9copy-2.3.8-Source/src/vamps/k9ffmpeg.h
+@@ -13,12 +13,12 @@
+ #define K9FFMPEG_H
+ 
+ #include <QString>
+-#include <avcodec.h>
+-#include <avformat.h>
+-#include <avutil.h>
+-#include <avio.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavutil/avutil.h>
++#include <libavformat/avio.h>
+ #ifdef HAVE_SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ /**
+ 	@author Jean-Michel PETIT <k9copy@free.fr>
diff --git a/app-cdr/k9copy/k9copy-2.3.8-r1.ebuild b/app-cdr/k9copy/k9copy-2.3.8-r1.ebuild
new file mode 100644
index 000000000000..51fee6ef525c
--- /dev/null
+++ b/app-cdr/k9copy/k9copy-2.3.8-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOC_DIRS="doc"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca cs da de el es es_AR fr it ja nl pl pt_BR ru sr sr@Latn tr uk zh_TW"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+MY_P=${P}-Source
+KDE_SCM="svn"
+inherit kde4-base
+
+ESVN_REPO_URI="https://k9copy.svn.sourceforge.net/svnroot/k9copy/kde4"
+ESVN_PROJECT="k9copy"
+DESCRIPTION="k9copy is a DVD backup utility which allows the copy of one or more titles from a DVD9 to a DVD5"
+HOMEPAGE="http://k9copy.sourceforge.net/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug mplayer"
+
+DEPEND="
+	media-libs/libdvdread
+	media-libs/libmpeg2
+	media-libs/xine-lib
+	media-video/ffmpeg
+"
+RDEPEND="${DEPEND}
+	media-video/dvdauthor
+	mplayer? ( media-video/mplayer )
+"
+DOCS=( README )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg-0.11.patch"
+	"${FILESDIR}/${P}-includepaths.patch"
+	"${FILESDIR}/${P}-ffmpeg-2.1.patch"
+)
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+	has_version '>=app-cdr/k3b-1.50' || elog "If you want K3b burning support in ${P}, please install app-cdr/k3b separately."
+}
diff --git a/app-cdr/k9copy/metadata.xml b/app-cdr/k9copy/metadata.xml
new file mode 100644
index 000000000000..d4420fa11d74
--- /dev/null
+++ b/app-cdr/k9copy/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>video</herd>
+	<upstream>
+		<remote-id type="sourceforge">k9copy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/kcdemu/Manifest b/app-cdr/kcdemu/Manifest
new file mode 100644
index 000000000000..98cb38bb3044
--- /dev/null
+++ b/app-cdr/kcdemu/Manifest
@@ -0,0 +1 @@
+DIST kcdemu-0.5.0.tar.gz 12251 SHA256 d93744048cf7ae6b86861d26e2c38c27fafd4a7d6e5703e03ed09d776273303a SHA512 25d81e466647456a28f0a100b16fc5c19a62119e08b3149a15dc653f3693993a3caaaadbb5a37f4a29c38cff0fb06efc1cc6faaf3a0817c85bd6ae2f99009926 WHIRLPOOL 5998b8a62011377d8961712f7fd523c9a1e505ec832262f22e0aa8ca74e0a943f150cd2dda01c788fdb1ecd97fad505f4a8d6b7ba53c6ab08a8d22e166c4ae87
diff --git a/app-cdr/kcdemu/kcdemu-0.5.0.ebuild b/app-cdr/kcdemu/kcdemu-0.5.0.ebuild
new file mode 100644
index 000000000000..6ba71ded4de8
--- /dev/null
+++ b/app-cdr/kcdemu/kcdemu-0.5.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+KDE_LINGUAS="de es pl ro sv"
+MY_PN="kde_cdemu"
+
+inherit kde4-base
+
+DESCRIPTION="A frontend to cdemu daemon for KDE4"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/KDE+CDEmu+Manager?content=99752"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/99752-${MY_PN}-${PV}.tar.bz2 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND=">=app-cdr/cdemu-2.0.0[cdemu-daemon]"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( ChangeLog )
diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml
new file mode 100644
index 000000000000..8fddefa5d03b
--- /dev/null
+++ b/app-cdr/kcdemu/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <herd>kde</herd>
+</pkgmetadata>
diff --git a/app-cdr/metadata.xml b/app-cdr/metadata.xml
new file mode 100644
index 000000000000..c7c7c3a8559e
--- /dev/null
+++ b/app-cdr/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-cdr category contains software for writing CDs and DVDs, and for
+		working with .iso files.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-cdr enthält Software für das Erstellen von CDs und DVDs, 
+		sowie für das Arbeiten mit ISO-Dateien.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-cdr contiene programas para escribir CDs y DVDs, y para
+		trabajar con archivos .iso.
+	</longdescription>
+	<longdescription lang="ja">
+		app-cdrカテゴリにはCDとDVDを書込んで、.isoファイルツールソフトウェアが
+		含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-cdr categorie bevat applicaties om CD's en DVD's te branden en om
+		.iso bestanden te bewerken.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-cdr chứa các phần mềm để ghi CD và DVD, làm
+		việc với các tập tin .iso.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-cdr contiene programmi per scrivere CD e DVD e lavorare con file .iso .
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-cdr contém software para gravar CDs e DVDs, e para
+		trabalhar com arquivos .iso.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-cdr zawiera programy służące do zapisywania danych na
+		płyty CD i DVD oraz służące do manipulowania plikami .iso.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-cdr/mirage2iso/Manifest b/app-cdr/mirage2iso/Manifest
new file mode 100644
index 000000000000..79ba67bd13d7
--- /dev/null
+++ b/app-cdr/mirage2iso/Manifest
@@ -0,0 +1,3 @@
+DIST mirage2iso-0.3-tests.tar.xz 4185308 SHA256 742d7cbaddb522967d858b5b0042e3ac7e6165134e1f69462292c7593d160258 SHA512 bc7f53a6810fae3cf726a1edc1a386edbf092e1c1bf7f79be7248d6cda86fa9678f764efbf6304442179549fc7ae6344195ec4a101eceb800d3465f115b20885 WHIRLPOOL f91ef202e4b835e1c4c33dade280181573d4016f51d4e16897e4f980b1d650e67e41cd007b1958954b90e562644f5f57b66d85809b0dc82e9ff2f731fd09d979
+DIST mirage2iso-0.4.1.tar.bz2 98593 SHA256 cb9f88689a243f8652acc77118ae6aac7fb016b453dacb93751f035229aee557 SHA512 a3b9970f56422fa8d4f6c9ffe5fca9810afb5b1fdad66b2bfd007aa6b857f8fa5d29cf9890ab066d4036c1ea57f03dba2bd1335e5630a3f52d511afb4d6acb06 WHIRLPOOL 972cce4c16e923e789230a2d789a2cd82ac07bf56dc4c330af33900d622c6a647c07e37e798555c6a10faa9e5bd917219b7133db8c57e48658cff6e1437c3474
+DIST mirage2iso-0.4.tar.bz2 92069 SHA256 f4cb1074c72ba22273677d037db046135b6ec0308a652bf2353e93594553df3a SHA512 e5a792b3a275b63c3c04921f957cc4ba10917875f9baa492369b3dae9432673fda20f2f103b73e986c79dca984d04748cf5802fa87fe07a1b5c08845a3c18339 WHIRLPOOL e48a2446159de82d815e471f749956127ec039e3742b9bcb725d0159287af301e4a756bab291ef8db92c14b711e2c3d04688e4b08d9d6186d8f3793a3ac37872
diff --git a/app-cdr/mirage2iso/metadata.xml b/app-cdr/mirage2iso/metadata.xml
new file mode 100644
index 000000000000..a77f7bb99714
--- /dev/null
+++ b/app-cdr/mirage2iso/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="pinentry">Support <pkg>app-crypt/pinentry</pkg> password
+			input backend.</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://bitbucket.org/mgorny/mirage2iso/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/mirage2iso</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild
new file mode 100644
index 000000000000..22b637fd1ebb
--- /dev/null
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils versionator
+
+TESTS_PV=0.3
+
+DESCRIPTION="CD/DVD image converter using libmirage"
+HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
+SRC_URI="https://bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2
+	test? ( https://bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pinentry test"
+
+COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+	dev-libs/glib:2=
+	pinentry? ( dev-libs/libassuan:0= )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? ( app-arch/xz-utils )"
+RDEPEND="${COMMON_DEPEND}
+	pinentry? ( app-crypt/pinentry )"
+
+src_configure() {
+	myeconfargs=(
+		$(use_with pinentry libassuan)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+	mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die
+	autotools-utils_src_test
+}
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.ebuild
new file mode 100644
index 000000000000..ab076a5d96fb
--- /dev/null
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils versionator
+
+TESTS_PV=0.3
+
+DESCRIPTION="CD/DVD image converter using libmirage"
+HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2
+	test? ( https://www.bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pinentry test"
+
+COMMON_DEPEND=">=dev-libs/libmirage-2.0.0
+	dev-libs/glib:2
+	pinentry? ( dev-libs/libassuan )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? ( app-arch/xz-utils )"
+RDEPEND="${COMMON_DEPEND}
+	pinentry? ( app-crypt/pinentry )"
+
+src_configure() {
+	myeconfargs=(
+		$(use_with pinentry libassuan)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+	mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die
+	autotools-utils_src_test
+}
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
new file mode 100644
index 000000000000..28080ccad345
--- /dev/null
+++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils versionator
+
+TESTS_PV=0.3
+
+DESCRIPTION="CD/DVD image converter using libmirage"
+HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2
+	test? ( https://www.bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pinentry test"
+
+COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+	dev-libs/glib:2=
+	pinentry? ( dev-libs/libassuan:0= )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? ( app-arch/xz-utils )"
+RDEPEND="${COMMON_DEPEND}
+	pinentry? ( app-crypt/pinentry )"
+
+#if LIVE
+DEPEND="${DEPEND}
+	dev-libs/libassuan"
+KEYWORDS=
+SRC_URI=
+#endif
+
+src_configure() {
+	myeconfargs=(
+		$(use_with pinentry libassuan)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_test() {
+#if LIVE
+	autotools-utils_src_test
+	return ${?}
+
+#endif
+	mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die
+	autotools-utils_src_test
+}
diff --git a/app-cdr/mkcdtoc/Manifest b/app-cdr/mkcdtoc/Manifest
new file mode 100644
index 000000000000..642a21c1b36d
--- /dev/null
+++ b/app-cdr/mkcdtoc/Manifest
@@ -0,0 +1 @@
+DIST mkcdtoc-1.0.tar.bz2 18255 SHA256 589ad3ec065738aef9a14fead3ef4d18d79aab243b7587fd0929203613346cc4 SHA512 1eb06913118f9c300f528ded9b733eb9842f5b781bad68493b2f938b2f2a876d3d9d19000d1e4a1f15974049464db09047ebab1570251241220315f80070d32f WHIRLPOOL b8b81401a91d4e2d2b1d1e819d4c9d893b0673847347605533a2018a69ec63b239373fa9a040f2c09c725e1a11455a7b1ec0f9484b80b6357e48f0acdd1ec4b4
diff --git a/app-cdr/mkcdtoc/metadata.xml b/app-cdr/mkcdtoc/metadata.xml
new file mode 100644
index 000000000000..46d57245c939
--- /dev/null
+++ b/app-cdr/mkcdtoc/metadata.xml
@@ -0,0 +1,16 @@
+<?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">
+		mkcdtoc is a command-line utility to create toc-files for cdrdao. It
+		reads a list of audio files in simple text or M3U format. The program
+		can be extended via plugins. There is plugins to fill CD-TEXT blocks
+		and perform audio file conversion.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mkcdtoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild b/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
new file mode 100644
index 000000000000..f7f07bd8c951
--- /dev/null
+++ b/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="command-line utility to create toc-files for cdrdao"
+HOMEPAGE="http://sourceforge.net/projects/mkcdtoc/"
+SRC_URI="mirror://sourceforge/mkcdtoc/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/perl-5.8.0"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake PREFIX="/usr" || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/app-cdr/mode2cdmaker/Manifest b/app-cdr/mode2cdmaker/Manifest
new file mode 100644
index 000000000000..3d79c9d5bca7
--- /dev/null
+++ b/app-cdr/mode2cdmaker/Manifest
@@ -0,0 +1 @@
+DIST mode2cdmaker-1.5.1-src.zip 57049 SHA256 d38f47cffe5d1276d1af9e8998a1100dc93e4d708cf284e6c3d8822f2bb6f38d SHA512 854aea23ae83521f689c5e4d91e6b3aba3e0977a987eb5a88fd340bb2b3f795ba76bf227a84727f3792b4f2453b4a4710d5e3782ccbfda79569506c23e77302f WHIRLPOOL 35b8dba61839c478bfcf1a6d83db51f9691b985b72402a317e7a9a1aabc1181419f6ed4d615d7429ce0f3fea599735446e5c9f830c1ad32f8f212fd4877f0489
diff --git a/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch b/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch
new file mode 100644
index 000000000000..502819c11df3
--- /dev/null
+++ b/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch
@@ -0,0 +1,46 @@
+diff -ur mode2cdmaker-1.5.1.orig/Makefile.linux mode2cdmaker-1.5.1/Makefile.linux
+--- mode2cdmaker-1.5.1.orig/Makefile.linux	2003-02-01 16:27:18.000000000 +0200
++++ mode2cdmaker-1.5.1/Makefile.linux	2008-06-15 19:24:14.000000000 +0300
+@@ -4,8 +4,8 @@
+ output=mode2cdmaker
+ 
+ all:
+-	gcc -c $(srcs)
+-	gcc -o $(output) $(objs)
++	$(CC) ${CFLAGS} -DMAX_PATH=512 -c $(srcs)
++	$(CC) ${LDFLAGS} -o $(output) $(objs)
+ 
+ clean:
+ 	-rm -f $(objs) $(output)
+diff -ur mode2cdmaker-1.5.1.orig/mkvcdfs.c mode2cdmaker-1.5.1/mkvcdfs.c
+--- mode2cdmaker-1.5.1.orig/mkvcdfs.c	2003-03-14 19:57:38.000000000 +0200
++++ mode2cdmaker-1.5.1/mkvcdfs.c	2008-06-15 19:23:25.000000000 +0300
+@@ -120,6 +120,7 @@
+ #endif
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -629,7 +630,7 @@
+ 				next_command[1]=(char*)malloc(256);
+ 				while (fgets(next_command[1],256,pf))
+ 				{
+-					next_command[1][lstrlen(next_command[1])-1]=0;
++					next_command[1][strlen(next_command[1])-1]=0;
+ 					parse_params(2,next_command,idepth+1);
+ 				}
+ 				fclose(pf);
+diff -ur mode2cdmaker-1.5.1.orig/vcdisofs.c mode2cdmaker-1.5.1/vcdisofs.c
+--- mode2cdmaker-1.5.1.orig/vcdisofs.c	2003-02-02 00:02:44.000000000 +0200
++++ mode2cdmaker-1.5.1/vcdisofs.c	2008-06-15 19:19:59.000000000 +0300
+@@ -80,6 +80,8 @@
+ #include <windows.h>
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <time.h>
+ #include "defaults.h"
+ 
diff --git a/app-cdr/mode2cdmaker/metadata.xml b/app-cdr/mode2cdmaker/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/mode2cdmaker/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild b/app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild
new file mode 100644
index 000000000000..94e9b586fe95
--- /dev/null
+++ b/app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to create mode-2 CDs, for example XCDs"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake -f Makefile.linux || die
+}
+
+src_install() {
+	dobin mode2cdmaker || die
+	dodoc {bugs,compatibility,readme}.txt
+}
diff --git a/app-cdr/mp3burn/Manifest b/app-cdr/mp3burn/Manifest
new file mode 100644
index 000000000000..d36b750cc890
--- /dev/null
+++ b/app-cdr/mp3burn/Manifest
@@ -0,0 +1 @@
+DIST mp3burn-0.4.2.tar.gz 17166 SHA256 062f214dbd93636e0787cd2cff50344422b28ad56b399b11c0d7e737a245b901 SHA512 96234f7e7a528b0073e3cb8130d5f606741532954e54de56757b4b0945d24fa72860e62ae1d78a13463ed8dca22848d99d49791957ba3c92cb60591d0f54f261 WHIRLPOOL c9dcef27a4f2643c4698a8a41bc5066bbd463a2010663aa30aba8417edb5de486e4a3c659b74ed38888b2121916702c876e74ac57e726808d1812197d3ef553e
diff --git a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
new file mode 100644
index 000000000000..13cf94d42643
--- /dev/null
+++ b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
@@ -0,0 +1,20 @@
+--- mp3burn	2013-08-18 23:13:34.843372424 +0000
++++ mp3burn	2013-08-18 23:14:15.663182707 +0000
+@@ -412,6 +412,8 @@
+ => F<mp3decoder>.  I<(Note:  Currently, the MP3 decoder must be
+ able to accept mpg123-style command-line arguments.)>
+ 
++=back
++
+ =cut
+ 
+ $mp3decoder = $encoder if $encoder;		# -M overrides .mp3burnrc
+@@ -586,6 +588,8 @@
+ 
+ =head1 DIAGNOSTICS
+ 
++=over 4
++
+ =item Error in .mp3burnrc:
+ 
+ Perl(1) cannot parse the F<.mp3burnrc> file.
diff --git a/app-cdr/mp3burn/metadata.xml b/app-cdr/mp3burn/metadata.xml
new file mode 100644
index 000000000000..ecaafbfb6544
--- /dev/null
+++ b/app-cdr/mp3burn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">mp3burn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
new file mode 100644
index 000000000000..3a819f2322b4
--- /dev/null
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Burn mp3s without filling up your disk with .wav files"
+HOMEPAGE="http://sourceforge.net/projects/mp3burn"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	media-sound/mpg123
+	media-libs/flac
+	media-sound/vorbis-tools
+	virtual/cdrtools
+	dev-perl/MP3-Info
+	dev-perl/ogg-vorbis-header
+	dev-perl/String-ShellQuote
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build.patch"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	einstalldocs
+}
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
new file mode 100644
index 000000000000..cd2e23cbd197
--- /dev/null
+++ b/app-cdr/multicd/Manifest
@@ -0,0 +1 @@
+DIST multicd-1.7.5.tar.gz 22437 SHA256 dedad330d161489ebd2d954a5b1e45f0423c76089f2520f1fe52a72238c6fee3 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85 WHIRLPOOL e052dcc533452173a881ba0be50195437466dad75e7f1dab2fe43e3aa7aee3f696f9748620a5f1d2fd85c797e8d48dd6a999c894870b74739eeff974b1ec31d8
diff --git a/app-cdr/multicd/metadata.xml b/app-cdr/multicd/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/multicd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..fc2fd852ddb6
--- /dev/null
+++ b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Tool for making direct copies of your files to multiple cd's"
+HOMEPAGE="http://danborn.net/multicd/"
+SRC_URI="http://danborn.net/multicd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.6
+	virtual/cdrtools"
+
+src_install() {
+	dobin multicd || die "dobin failed."
+	insinto /etc
+	newins sample_multicdrc multicdrc || die "newins failed."
+}
diff --git a/app-cdr/mybashburn/Manifest b/app-cdr/mybashburn/Manifest
new file mode 100644
index 000000000000..e5a87d89629e
--- /dev/null
+++ b/app-cdr/mybashburn/Manifest
@@ -0,0 +1 @@
+DIST mybashburn-1.0.2.tar.bz2 75017 SHA256 058395728c295988c3d633f5a2a25224f25babea6117d4b35c26c7b7b93e0d6a SHA512 6bc8db179d10f7549838398098fd350e750655b3f2d9de91bec6806c4e30a066211209f86b6d805d909d9da94888b7483dd2b13ea2dbb44f83e0fb5f98f70bd3 WHIRLPOOL f5a2abe9f1b45a60b5399f5771d0f28fc7cc6f4b7fbfae5cf39a05fae40456527e8feb23a457dee355189df99dadbfe43bd7749676c12ad433fe6f323b15b111
diff --git a/app-cdr/mybashburn/metadata.xml b/app-cdr/mybashburn/metadata.xml
new file mode 100644
index 000000000000..e3262c6b7f10
--- /dev/null
+++ b/app-cdr/mybashburn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<use>
+		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mybashburn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/mybashburn/mybashburn-1.0.2.ebuild b/app-cdr/mybashburn/mybashburn-1.0.2.ebuild
new file mode 100644
index 000000000000..ffd5ec38a35e
--- /dev/null
+++ b/app-cdr/mybashburn/mybashburn-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Command-line burning interface of data and music CDs and DVDs"
+HOMEPAGE="http://mybashburn.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mybashburn/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dvdr flac mp3 normalize vorbis"
+
+DEPEND=""
+RDEPEND="dev-util/dialog
+	app-cdr/cdrdao
+	app-cdr/cdrkit
+	virtual/eject
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( media-sound/lame
+		media-sound/mpg123 )
+	flac? ( media-libs/flac )
+	vorbis? ( media-sound/vorbis-tools )
+	normalize? ( media-sound/normalize )"
+
+RESTRICT="test"
+
+src_compile() {
+	sed -i 's/\/usr/usr/' "${S}"/Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc CREDITS ChangeLog FAQ HOWTO README TODO
+}
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
new file mode 100644
index 000000000000..da5af77287bd
--- /dev/null
+++ b/app-cdr/nero/Manifest
@@ -0,0 +1,2 @@
+DIST nerolinux-4.0.0.0b-x86.rpm 17391650 SHA256 03ec02c35f6f6dce4315d396b79b50031e507194475d2e6e24326f96dbfe9465 SHA512 2168f87d329054803b6ac33f671aeaee59f5b9e22fb07c23347ae519d63fc4547db9d6e535f58468f2fba4ac274399f934a34d828892ae93e75cf2c2b46d44c7 WHIRLPOOL 9125e2873b35f13595780eb13b38cf3cfae7a3e119869253d329d1bb2452f5ad6b93d2fa9a390be8f4832e7b82147b915c33641134fee6244f52675ee119add3
+DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 SHA256 a68101eca1095cf523cd7cb39132f5c0b2ae98cc7fe0a8d89590285b59e78965 SHA512 0e5d6c1c9f99b6c149a72f544c6ec7608e9ded4c0d31a7754785a0d16fb3ad77d9d82cc210617104ac6dc2470b3df778cdf132be86a0591813e7a867d3c75a51 WHIRLPOOL a44e9e1fd6aea7d2fb8a95c7e02e5537dd55cb2b4ad85bb0696fae77d346e71fb5ce81b1843f2c198c13fe32dbbdb55a4a28cbeec7d81194e9ba3edba083c855
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/nero/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/nero/nero-4.0.0.0b.ebuild b/app-cdr/nero/nero-4.0.0.0b.ebuild
new file mode 100644
index 000000000000..bd2483dde978
--- /dev/null
+++ b/app-cdr/nero/nero-4.0.0.0b.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils fdo-mime rpm multilib gnome2-utils linux-info
+
+DESCRIPTION="Nero Burning ROM for Linux"
+HOMEPAGE="http://nerolinux.nero.com"
+SRC_URI="x86? ( mirror://${PN}/${PN}linux-${PV}-x86.rpm )
+	amd64? ( mirror://${PN}/${PN}linux-${PV}-x86_64.rpm )"
+
+LICENSE="Nero-EULA-US"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RESTRICT="strip mirror test"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/pango[X]"
+DEPEND=""
+
+QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
+	opt/${PN}/$(get_libdir)/libNeroAPI.so"
+QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
+QA_PREBUILT="opt/${PN}/${PN}.*
+	opt/${PN}/${PN}
+	opt/${PN}/$(get_libdir)/.*so
+	opt/${PN}/$(get_libdir)/${PN}/*
+	opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
+	usr/share/${PN}/helpers/splash/nerosplash"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	CONFIG_CHECK="~CHR_DEV_SG"
+	linux-info_pkg_setup
+}
+
+src_install() {
+	insinto /etc
+	doins -r etc/nero
+
+	insinto /opt/nero
+	doins -r usr/$(get_libdir)
+	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero
+
+	exeinto /opt/nero
+	doexe usr/bin/nero*
+
+	insinto /usr/share
+	doins -r usr/share/nero usr/share/locale usr/share/icons
+
+	domenu usr/share/applications/*.desktop
+	doicon usr/share/pixmaps/nerolinux.xpm
+
+	doman usr/share/man/man1/*
+	use doc && dodoc usr/share/doc/nero/*.pdf
+
+	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
+	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
+	make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
+
+	# This is a ugly hack to fix burning in x86_64.
+	# http://club.cdfreaks.com/showthread.php?t=218041
+	use amd64 && cp usr/share/nero/Nero*.txt "${D}"/opt/nero/$(get_libdir)/nero
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	nero --perform-post-installation
+
+	elog "Technical support for NeroLINUX is provided by CDFreaks"
+	elog "Linux forum at http://club.cdfreaks.com/forumdisplay.php?f=104"
+	elog
+	elog "You also need to setup your user to cdrom group."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
new file mode 100644
index 000000000000..523734b82d5a
--- /dev/null
+++ b/app-cdr/nrg2iso/Manifest
@@ -0,0 +1 @@
+DIST nrg2iso-0.4.tar.gz 8553 SHA256 25049d864680ec12bbe31b20597ce8c1ba3a4fe7a7f11e25742b83e2fda94aa3 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68 WHIRLPOOL 668d43e1a3dc7e3dfc41f92212d3c102d41ef055f7af396a4e8726aa047701e64bac4100f3a149e61641d52bbbc88a6bd024976e2bda62a84535017cac835b14
diff --git a/app-cdr/nrg2iso/metadata.xml b/app-cdr/nrg2iso/metadata.xml
new file mode 100644
index 000000000000..6259b9670113
--- /dev/null
+++ b/app-cdr/nrg2iso/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>Nrg2Iso is a linux utils for converting CD (or DVD) image
+generated by Nero Burning Rom to ISO format.
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
new file mode 100644
index 000000000000..544ed942768d
--- /dev/null
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts Nero nrg CD-images to iso"
+HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
+SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o nrg2iso nrg2iso.c || die "compile failed."
+}
+
+src_install() {
+	dobin nrg2iso || die "dobin failed."
+	dodoc CHANGELOG
+}
diff --git a/app-cdr/pburn/Manifest b/app-cdr/pburn/Manifest
new file mode 100644
index 000000000000..91f5eabdd676
--- /dev/null
+++ b/app-cdr/pburn/Manifest
@@ -0,0 +1 @@
+DIST pburn-3.4.3.pet 66536 SHA256 d1a66bbffc66d38b7f75790fa39cd134e1aef070b2e140f52788bd2dfcdb303a SHA512 8bd67dfb9b3c08510ff9b675ec69929a0719871e2c9924fb4defe41147e2c7096b305776cca7f07fe7a28ec65133106636ee5804ca43ca2b5f6e1fe487eed99c WHIRLPOOL 8a10fc1039b7b0848af0dcda6a394815916218c31942f8c037f1b3ac0d272bea1fd556a4fe451ac2f569b45172b0af6d258826e2a072035a7b5322759803abe8
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
new file mode 100644
index 000000000000..3ca6ae763b34
--- /dev/null
+++ b/app-cdr/pburn/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/pburn/pburn-3.4.3.ebuild b/app-cdr/pburn/pburn-3.4.3.ebuild
new file mode 100644
index 000000000000..285bbc18b24e
--- /dev/null
+++ b/app-cdr/pburn/pburn-3.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# wget --user puppy --password linux "http://www.meownplanet.net/zigbert/${P}.pet"
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A burning tool with GTK+ frontend"
+HOMEPAGE="http://murga-linux.com/puppy/viewtopic.php?t=23881"
+SRC_URI="mirror://gentoo/${P}.pet"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/killproc
+	app-cdr/cddetect
+	app-cdr/dvd+rw-tools
+	sys-apps/hotplug2stdout
+	virtual/cdrtools
+	>=x11-misc/gtkdialog-0.8.0"
+DEPEND="app-arch/pet2tgz"
+
+src_unpack() {
+	pet2tgz -i "${DISTDIR}"/${P}.pet -o "${WORKDIR}"/${P}.tar.gz
+	unpack ./${P}.tar.gz
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/${PN}
+	#!/bin/bash
+	"/usr/share/${PN}/${PN}" "\$@"
+	EOF
+
+	sed -i -e 's:usleep:/sbin/&:' usr/local/pburn/box_splash || die
+}
+
+src_install() {
+	dobin "${T}"/${PN}
+
+	dodir /usr/share
+	cp -dpR usr/local/${PN} "${D}"/usr/share || die
+
+	make_desktop_entry \
+		${PN} \
+		"Pburn CD/DVD/Blu-ray writer" \
+		/usr/share/${PN}/${PN}20.png \
+		"AudioVideo;DiscBurning"
+
+	dohtml -r usr/share/doc/${PN}
+}
diff --git a/app-cdr/plextor-tool/Manifest b/app-cdr/plextor-tool/Manifest
new file mode 100644
index 000000000000..32a910b71b41
--- /dev/null
+++ b/app-cdr/plextor-tool/Manifest
@@ -0,0 +1 @@
+DIST plextor-tool-0.5.0.src.tar.bz2 51594 SHA256 a62787eb2a1f311b66a467777aa864a1e478a649895ba2708f8f46e85e5bd20a SHA512 a613c081bf01f387cd3b6b03b1c81e12a654e1e706ff96ad8aae9afe5e001b91627f95995fae838a5b47c83dd1d07bfefcb0c26d9bb981f4f72bbb3e2eaa8d75 WHIRLPOOL 4cb72cf2517fbc2d98476856abd6944112315970e9c2327f5df8275b68bf82afed7f3ca8faa9f90f380901363388c3f2d09b7a9745c9e0bea53aa46649381bc3
diff --git a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
new file mode 100644
index 000000000000..d2a181f14fed
--- /dev/null
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@@ -0,0 +1,61 @@
+--- Makefile
++++ Makefile
+@@ -2,17 +2,17 @@
+ #               Copyright (c) 1999-2002 Georg Huettenegger
+ #
+ 
+-CC=gcc
+-INCLUDES=-Icommon/
++CC?=gcc
++CPPFLAGS+=-Icommon/
+ 
+ # defines to be set for release
+ 
+-DEFINES=-DUSE_GNOME
+-SCFLAGS=-Wall $(DEFINES) $(INCLUDES)
+-CFLAGS=`gnome-config --cflags applets` $(SCFLAGS)
+-LFLAGS=`gnome-config --libs applets`
++CPPFLAGS += -DUSE_GNOME
++CFLAGS += -Wall
++CFLAGS +=
++LFLAGS=$(LDFLAGS)
+ # the following line worked on RedHat 7.0/1/2
+-SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
++#SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+ # the following line worked on RedHat 6.1
+ #SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
+ 
+@@ -53,18 +53,16 @@
+ RM=rm
+ STRIP=strip
+ 
+-all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8.gz strip
++all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8
+ 
+-plextor-tool.8.gz:	../doc/plextor-tool.groff
++plextor-tool.8:	../doc/plextor-tool.groff
+ 	$(MANCC) $(MANCCFLAGS) ../doc/plextor-tool.groff > plextor-tool.8
+-	$(RM) -f plextor-tool.8.gz
+-	gzip plextor-tool.8
+ 
+ plextor-tool:	$(COBJS)
+-	$(CC) -o $@ $(COBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ pt-static:	$(COBJS)
+-	$(CC) -static -o $@ $(COBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^
+ 
+ ls_mode_pages:	$(LSMPOBJS)
+ 	$(CC) -o $@ $(LSMPOBJS)
+@@ -110,10 +108,8 @@
+ 
+ .SUFFIXES: .o .cpp
+ .cpp.o:
+-	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+ .SUFFEXES: .o .c
+ .c.o:
+-	$(CC) -c $(CFLAGS) -o $@ $<
+ 
+ include .depend
diff --git a/app-cdr/plextor-tool/metadata.xml b/app-cdr/plextor-tool/metadata.xml
new file mode 100644
index 000000000000..645443001f0a
--- /dev/null
+++ b/app-cdr/plextor-tool/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">plextor-tool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
new file mode 100644
index 000000000000..f8455bf52758
--- /dev/null
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
+HOMEPAGE="http://plextor-tool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+S=${WORKDIR}/${PN}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	gunzip plextor-tool.8.gz || die
+}
+
+src_compile() {
+	local targets="plextor-tool"
+	use static && targets="${targets} pt-static"
+	echo ${targets} > my-make-targets
+	emake CC="$(tc-getCC)" ${targets}
+}
+
+src_install() {
+	local targets=$(<my-make-targets)
+	dodoc ../doc/{NEWS,README} TODO
+	dobin ${targets}
+	doman plextor-tool.8
+}
diff --git a/app-cdr/poweriso/Manifest b/app-cdr/poweriso/Manifest
new file mode 100644
index 000000000000..b9723d3d5477
--- /dev/null
+++ b/app-cdr/poweriso/Manifest
@@ -0,0 +1 @@
+DIST poweriso-1.3.tar.gz 288910 SHA256 605ae3fceb93952422b42d868f1317d1c6d48d2bdbaee700dcf17e99dbe65fc0 SHA512 532e17c624bcb289214d8efd9e49bef04ef25d1d54d347dab108b44470e0cbfed6b2ff2357b4375a1edea02eebaecce7634d5f8cfe4c4b650aef0b5da0b5c7c7 WHIRLPOOL a8446d7e5f2fd8843686f5102c544507a7ea331f17243874cce48941261fadc661ff236b23eb82964533c31c216330f9a6726d0dfa1f9d7c320691340de7bf04
diff --git a/app-cdr/poweriso/metadata.xml b/app-cdr/poweriso/metadata.xml
new file mode 100644
index 000000000000..bb93fa2613e7
--- /dev/null
+++ b/app-cdr/poweriso/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/poweriso/poweriso-1.3.ebuild b/app-cdr/poweriso/poweriso-1.3.ebuild
new file mode 100644
index 000000000000..2eebe15f27ac
--- /dev/null
+++ b/app-cdr/poweriso/poweriso-1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Utility to extract, list and convert PowerISO DAA image files"
+HOMEPAGE="http://www.poweriso.com"
+SRC_URI="http://www.${PN}.com/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+QA_PRESTRIPPED="opt/bin/poweriso"
+
+S=${WORKDIR}
+
+src_install() {
+	into /opt
+	dobin ${PN} || die
+}
diff --git a/app-cdr/qmultirecord/Manifest b/app-cdr/qmultirecord/Manifest
new file mode 100644
index 000000000000..099c10f04701
--- /dev/null
+++ b/app-cdr/qmultirecord/Manifest
@@ -0,0 +1 @@
+DIST qmultirecord-0.0.3.tar.bz2 52044 SHA256 ad4bd771b5370234010143c3fcbee1cde887c4be29584a532346def580628cfb SHA512 82e76b75c949b2e8c0c84749a27a439731328652634c0deca1f5f0cfab70055d74fe647fc7edd9e75bf48750ca4833cff30edb203dfb699b05e11d572bb3076c WHIRLPOOL 02a91d2fd1e5c073b114461bacb817e5cd1253cfdef0d5080cf4881b50befb365135e7e2014136d99331a575851565e8e09c352e77aa4b11ca56a8daf252a5be
diff --git a/app-cdr/qmultirecord/files/qmultirecord b/app-cdr/qmultirecord/files/qmultirecord
new file mode 100644
index 000000000000..9e90e6e65537
--- /dev/null
+++ b/app-cdr/qmultirecord/files/qmultirecord
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/qmultirecord
+exec /usr/libexec/qmultirecord.bin
diff --git a/app-cdr/qmultirecord/files/qmultirecord-0.0.3-langinfo_h.patch b/app-cdr/qmultirecord/files/qmultirecord-0.0.3-langinfo_h.patch
new file mode 100644
index 000000000000..403bfe6743f2
--- /dev/null
+++ b/app-cdr/qmultirecord/files/qmultirecord-0.0.3-langinfo_h.patch
@@ -0,0 +1,13 @@
+Only in qmultirecord-0.0.3: Makefile
+diff -ur qmultirecord-0.0.3.orig/src/capplication.cpp qmultirecord-0.0.3/src/capplication.cpp
+--- qmultirecord-0.0.3.orig/src/capplication.cpp	2009-08-09 16:14:17.000000000 +0300
++++ qmultirecord-0.0.3/src/capplication.cpp	2009-08-12 21:55:20.000000000 +0300
+@@ -18,6 +18,8 @@
+ //! -*- coding: UTF-8 -*-
+ #define SOURCE_CODING "UTF-8"
+ 
++#include <langinfo.h>
++
+ #include <QtCore>
+ #include <QtXml>
+ 
diff --git a/app-cdr/qmultirecord/metadata.xml b/app-cdr/qmultirecord/metadata.xml
new file mode 100644
index 000000000000..8f92762cc1c9
--- /dev/null
+++ b/app-cdr/qmultirecord/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/qmultirecord/qmultirecord-0.0.3.ebuild b/app-cdr/qmultirecord/qmultirecord-0.0.3.ebuild
new file mode 100644
index 000000000000..b46e74838d4b
--- /dev/null
+++ b/app-cdr/qmultirecord/qmultirecord-0.0.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils qt4-r2
+
+DESCRIPTION="CD and DVD recording frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://qt-apps.org/content/show.php/qmultirecord?content=106254"
+SRC_URI="http://qt-apps.org/CONTENT/content-files/106254-${P}_fix.tar.bz2 ->
+${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtcore:4"
+RDEPEND="${COMMON_DEPEND}
+	virtual/eject
+	app-cdr/dvd+rw-tools
+	virtual/cdrtools"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-langinfo_h.patch" )
+
+src_install() {
+	exeinto /usr/libexec
+	doexe bin/*.bin || die "doexe failed"
+	insinto /usr/share/${PN}
+	doins bin/*.txt || die "doins failed"
+	dobin "${FILESDIR}"/${PN} || die "dobin failed"
+	newicon src/icons/burn_on.png ${PN}.png
+	make_desktop_entry ${PN} QMultirecorder ${PN} "Utility;Qt;DiscBurning"
+	dodoc ChangeLog README TODO bin/*.example || die "dodoc failed"
+}
diff --git a/app-cdr/qpxtool/Manifest b/app-cdr/qpxtool/Manifest
new file mode 100644
index 000000000000..e3c9fc7f7e26
--- /dev/null
+++ b/app-cdr/qpxtool/Manifest
@@ -0,0 +1 @@
+DIST qpxtool-0.7.2.tar.bz2 587694 SHA256 ac18e4a1b4cb616c0218d04ab5a7b02f53c84449d1d0f63aa3f712656992c526 SHA512 e9384583ebdbcf450ef4fc637d9d99ac6598a5217caecb7c46e2f844e25f8808806eb31f08530a7d89f8b31247141413c306529780dbb71d992140de34a8877c WHIRLPOOL 7e44290209276f80d042e975fa57d4ec392d9dfb46e0fafe8f53cc1da2ea82d368e6b2a0f267a93a87dc8e3d3defd71c066d1a30eeb694009acef561c12f9863
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch
new file mode 100644
index 000000000000..b1be8dba1135
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.7.0-libpng15.patch
@@ -0,0 +1,125 @@
+--- console/f1tattoo/f1tattoo.cpp
++++ console/f1tattoo/f1tattoo.cpp
+@@ -96,6 +96,10 @@
+ 	int      c;
+ 	int32_t  r,g,b;
+ 
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++
+ 	if (fread(header, 1, 8, fp) < 8) {
+ 		printf("Error reading PNG header\n");
+ 		fclose(fp);	
+@@ -129,9 +133,9 @@
+ 
+ 	png_read_info(png_ptr, info_ptr);
+ 
+-	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
++	printf("Image size: %ld x %ld\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
+ 
+-	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
++	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
+ 		printf("Image should be 3744 x %d", rows);
+ 		return 1;
+ 	}
+@@ -143,14 +147,14 @@
+ 	number_of_passes = png_set_interlace_handling(png_ptr);
+ 	png_read_update_info(png_ptr, info_ptr);
+ 
+-	printf("Color type: [%d] ", info_ptr->color_type);
+-	switch (info_ptr->color_type) {
++	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
++	switch (png_get_color_type(png_ptr, info_ptr)) {
+ 	    case PNG_COLOR_TYPE_GRAY:
+ 			printf("PNG_COLOR_TYPE_GRAY\n");
+ 			break;
+ 	    case PNG_COLOR_TYPE_PALETTE:
+ 			printf("PNG_COLOR_TYPE_PALETTE\n");
+-			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
++			if (!(png_get_valid(png_ptr,info_ptr,PNG_INFO_PLTE))) {
+ 				printf("PNG color type is indexed, but no palette found!");
+ 				goto err_read_png;
+ 			}
+@@ -168,49 +172,49 @@
+ 			printf("unlnown PNG color type!\n");
+ 			goto err_read_png;
+ 	}
+-	printf("Bit depth : %d\n", info_ptr->bit_depth);
+-	if (info_ptr->bit_depth != 8) {
++	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
++	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
+ 		printf("Unsupported bit depth!\n");
+ 		goto err_read_png;
+ 	}
+-	if (info_ptr->valid & PNG_INFO_PLTE) {
+-		printf("Palette   : %d colors\n", info_ptr->num_palette);
++	if (png_get_valid(png_ptr,info_ptr,PNG_INFO_PLTE)) {
++		printf("Palette   : %d colors\n", num_palette);
+ 	} else {
+ 		printf("Palette   : NO\n");
+ 	}
+-	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
++	printf("ROW bytes : %ld\n", png_get_rowbytes(png_ptr, info_ptr));
+ 
+ 
+ 	raw_row_pointer = buf;
+-	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
++	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
+ 	for (row=0; row<rows; row++) {
+ 		if (setjmp(png_jmpbuf(png_ptr))) {
+ 			printf("png_jmpbuf failed!\n");
+ 			goto err_read_png;
+ 		}
+ 		png_read_row(png_ptr, png_row_pointer, NULL);
+-		if (info_ptr->width < 3744U)
++		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
+ 			memset(raw_row_pointer, 0, 3744);
+ 
+-		switch (info_ptr->color_type) {
++		switch (png_get_color_type(png_ptr, info_ptr)) {
+ 		    case PNG_COLOR_TYPE_GRAY:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
+ //					memcpy(raw_row_pointer, png_row_pointer, 3744);
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_PALETTE:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					c = png_row_pointer[col];
+-					r = info_ptr->palette[c].red;
+-					g = info_ptr->palette[c].green;
+-					b = info_ptr->palette[c].blue;
++					r = palette[c].red;
++					g = palette[c].green;
++					b = palette[c].blue;
+ 					c = (r*11 + g*16 + b*5) / 32;
+ 					raw_row_pointer[col] = c ^ 0xFF;
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_RGB:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					r = png_row_pointer[col*3];
+ 					g = png_row_pointer[col*3+1];
+ 					b = png_row_pointer[col*3+2];
+@@ -219,7 +223,7 @@
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_RGB_ALPHA:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					r = png_row_pointer[col*4];
+ 					g = png_row_pointer[col*4+1];
+ 					b = png_row_pointer[col*4+2];
+@@ -228,7 +232,7 @@
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
+ 				}
+ 				break;
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch
new file mode 100644
index 000000000000..9192a90a7892
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.7.0-locale-install-race.patch
@@ -0,0 +1,33 @@
+--- qpxtool-0.7.0/gui/updateqm.pri.orig	2010-01-25 19:44:45.061640334 +0100
++++ qpxtool-0.7.0/gui/updateqm.pri	2010-01-25 19:40:03.711640850 +0100
+@@ -0,0 +1,19 @@
++isEmpty(QMAKE_LRELEASE) {
++
++    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
++
++    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
++
++}
++
++updateqm.input = TRANSLATIONS
++
++updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
++
++updateqm.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
++
++updateqm.CONFIG += no_link
++
++QMAKE_EXTRA_COMPILERS += updateqm
++
++PRE_TARGETDEPS += compiler_updateqm_make_all
+--- qpxtool-0.7.0/gui/qpxtool.pro.orig	2010-01-25 19:46:45.011641756 +0100
++++ qpxtool-0.7.0/gui/qpxtool.pro	2010-01-25 19:47:08.397640627 +0100
+@@ -2,6 +2,8 @@
+ # Automatically generated by qmake (2.01a) ?? ???. 24 12:26:02 2009
+ ######################################################################
+ 
++include( updateqm.pri )
++
+ MOC_DIR=moc
+ OBJECTS_DIR=obj
+ QT+=network
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch b/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch
new file mode 100644
index 000000000000..ef46e5e6a23c
--- /dev/null
+++ b/app-cdr/qpxtool/files/qpxtool-0.7.2-libs.patch
@@ -0,0 +1,11 @@
+--- qpxtool-0.7.2/gui/qpxtool.pro
++++ qpxtool-0.7.2/gui/qpxtool.pro
+@@ -13,6 +13,8 @@
+ DEPENDPATH += . include locale src
+ INCLUDEPATH += . include
+ 
++LIBS+=-L../lib/lib -lqpxtransport
++
+ # Input
+ HEADERS += include/about.h \
+            include/abstractpreview.h \
diff --git a/app-cdr/qpxtool/metadata.xml b/app-cdr/qpxtool/metadata.xml
new file mode 100644
index 000000000000..6396beb75f92
--- /dev/null
+++ b/app-cdr/qpxtool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<upstream>
+		<remote-id type="sourceforge">qpxtool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/qpxtool/qpxtool-0.7.2.ebuild b/app-cdr/qpxtool/qpxtool-0.7.2.ebuild
new file mode 100644
index 000000000000..f841fc9eaf7d
--- /dev/null
+++ b/app-cdr/qpxtool/qpxtool-0.7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs qt4-r2
+
+DESCRIPTION="CD/DVD quality checking utilities"
+HOMEPAGE="http://qpxtool.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	media-libs/libpng"
+
+DOCS="AUTHORS ChangeLog README SupportedDevices TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.0-locale-install-race.patch \
+		"${FILESDIR}"/${PN}-0.7.0-libpng15.patch \
+		"${FILESDIR}"/${PN}-0.7.2-libs.patch
+}
+
+src_configure() {
+	tc-export CXX
+	./configure --prefix=/usr || die
+	cd gui || die
+	mv -v Makefile{,.orig} || die "Backup Makefile for install"
+	qt4-r2_src_configure
+}
+
+src_install() {
+	mv -v gui/Makefile.orig gui/Makefile || die "Restore Makefile for install"
+	dodir /usr/bin
+	dohtml status.html
+	qt4-r2_src_install
+}
diff --git a/app-cdr/recorder/Manifest b/app-cdr/recorder/Manifest
new file mode 100644
index 000000000000..890881b00e2f
--- /dev/null
+++ b/app-cdr/recorder/Manifest
@@ -0,0 +1 @@
+DIST recorder-1.4.5.tar.bz2 32037 SHA256 9bef2520c81c7afaf565080b9e157c8fa454c74e2ab821dc79b899de0aeba010 SHA512 b923241fe41a326caf21668f6f7a2e461c98049846163dcbdfad42e3c8fe9a3d33c48066708b2df426da26bfa325a535a3494397a2fe3e4b94820c7e4b8d88a8 WHIRLPOOL 11fea10982a7aaabefb03144751043632eb8987549ec43521609e18b3dc29538fe231c089bca0d7e2bd0272e00bda1f47be682ceb402dafb78e2b47d2912e648
diff --git a/app-cdr/recorder/metadata.xml b/app-cdr/recorder/metadata.xml
new file mode 100644
index 000000000000..71fa8c598679
--- /dev/null
+++ b/app-cdr/recorder/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <longdescription lang="en">
+    Recorder is a graphical frontend of cdrecord/cdrtools, cdrdao, mkisofs
+    and growisofs. It aims to be simple and easy to use, free of large
+    configurations and useless options, following the KISS principle and
+    offering a disc burning of quality, nothing more. You can burn data
+    (CD/DVD), audio (CD), video (DVD, VCD and SVCD), iso images (CD/DVD),
+    create iso images to burn later and check integrity of burned files
+    with md5sum.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-cdr/recorder/recorder-1.4.5-r1.ebuild b/app-cdr/recorder/recorder-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..5e2b36728c74
--- /dev/null
+++ b/app-cdr/recorder/recorder-1.4.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime python-single-r1
+
+DESCRIPTION="A simple GTK+ disc burner"
+HOMEPAGE="http://code.google.com/p/recorder/"
+SRC_URI="http://recorder.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dvdr mp3 nls ogg vcd"
+
+LANGS="ar cs es fr it nl pl pt_BR ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	sys-apps/coreutils
+	virtual/cdrtools
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( media-sound/mpg123 )
+	ogg? ( media-sound/vorbis-tools )
+	vcd? (
+		app-cdr/cdrdao
+		media-video/vcdimager
+	)"
+
+DOCS=( CHANGELOG TRANSLATORS )
+
+src_prepare() {
+	python_fix_shebang recorder
+
+	local MY_NLS=""
+	if use nls; then
+		for ling in ${LINGUAS}; do
+			if has $ling ${LANGS}; then
+				MY_NLS="${MY_NLS} ${ling}"
+			fi
+		done
+	fi
+
+	sed -i -e "s:ar cs es fr pt_BR ru it nl:${MY_NLS}:" Makefile || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/recorder/recorder-1.4.5.ebuild b/app-cdr/recorder/recorder-1.4.5.ebuild
new file mode 100644
index 000000000000..467b5d0ad88a
--- /dev/null
+++ b/app-cdr/recorder/recorder-1.4.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+
+inherit fdo-mime python
+
+DESCRIPTION="A simple GTK+ disc burner"
+HOMEPAGE="http://code.google.com/p/recorder/"
+SRC_URI="http://recorder.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dvdr mp3 nls ogg vcd"
+
+LANGS="ar cs es fr it nl pl pt_BR ru sv"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	>=dev-python/pygtk-2
+	sys-apps/coreutils
+	virtual/cdrtools
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( media-sound/mpg123 )
+	ogg? ( media-sound/vorbis-tools )
+	vcd? (
+		app-cdr/cdrdao
+		media-video/vcdimager
+		)"
+
+DOCS="CHANGELOG TRANSLATORS"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs 2 recorder
+
+	local MY_NLS=""
+	if use nls; then
+		for ling in ${LINGUAS}; do
+			if has $ling ${LANGS}; then
+				MY_NLS="${MY_NLS} ${ling}"
+			fi
+		done
+	fi
+
+	sed -i -e "s:ar cs es fr pt_BR ru it nl:${MY_NLS}:" Makefile || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/sync2cd/Manifest b/app-cdr/sync2cd/Manifest
new file mode 100644
index 000000000000..20d5dfb2abdb
--- /dev/null
+++ b/app-cdr/sync2cd/Manifest
@@ -0,0 +1 @@
+DIST sync2cd-1.3.tar.gz 39663 SHA256 159fc8a426d1259899d4adab6e4c2fbf4a37362e45dd52813217290cc5ab963c SHA512 a80c00e4a5e1eccf12750e7c6bae606fb1befeba1ad6510e887c931e3bdecef28864053a9a8933f55073204577e173b8109456051e47bce5f26d35be24052c4a WHIRLPOOL a10d9c48d88df24782b215280623094e264ab686f7d21a0995c6a9a1ed93a5092460d80f959ffedd8aa39d3289f11ac750be0fe46e8ef7e420f9c9b427a422d0
diff --git a/app-cdr/sync2cd/metadata.xml b/app-cdr/sync2cd/metadata.xml
new file mode 100644
index 000000000000..1f9afb61bd09
--- /dev/null
+++ b/app-cdr/sync2cd/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-optical</herd>
+<longdescription>
+sync2cd is an incremental archiving tool. It allows backing up complete filesystem hierarchies to multiple backup 
+media (e.g. CD-R). Files are archived incrementally, i.e. only new or changed files are stored during an archive 
+operation.
+
+All entity types are supported: directories, files, symlinks, named pipes, sockets, block and character devices.
+(copyied off ref url)
+</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild b/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
new file mode 100644
index 000000000000..d7d0750f8101
--- /dev/null
+++ b/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An incremental archiving tool to CD/DVD"
+HOMEPAGE="http://www.calins.ch/software/sync2cd.html"
+SRC_URI="http://www.calins.ch/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cdr dvdr"
+
+RDEPEND="virtual/eject
+	cdr? ( virtual/cdrtools )
+	dvdr? ( app-cdr/dvd+rw-tools )"
+DEPEND=""
+
+python_test() {
+	cd tests || die
+	"${PYTHON}" run.py || die "Unit tests failed for ${EPYTHON}"
+}
diff --git a/app-cdr/sync2cd/sync2cd-1.3.ebuild b/app-cdr/sync2cd/sync2cd-1.3.ebuild
new file mode 100644
index 000000000000..89ef0e2d74cf
--- /dev/null
+++ b/app-cdr/sync2cd/sync2cd-1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+DESCRIPTION="An incremental archiving tool to CD/DVD"
+HOMEPAGE="http://www.calins.ch/software/sync2cd.html"
+SRC_URI="http://www.calins.ch/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="cdr dvdr"
+
+RDEPEND="virtual/eject
+	cdr? ( virtual/cdrtools )
+	dvdr? ( app-cdr/dvd+rw-tools )"
+DEPEND=""
+
+PYTHON_MODNAME="sync2cd.py"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_test() {
+	cd tests
+	"$(PYTHON)" run.py || die "Unit tests failed"
+}
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
new file mode 100644
index 000000000000..9be93051d2fd
--- /dev/null
+++ b/app-cdr/tkdvd/Manifest
@@ -0,0 +1 @@
+DIST tkdvd-4.0.9.tar.gz 71046 SHA256 0e9cbc014699eb6c423f8b88a728ba8dd5519928f4968f68a94f8a0a81651ac7 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820 WHIRLPOOL 92bcfdd2fddfc85a323bef6de26b58caa7d7a7632d4a5210eb8ecb058d401a64077d5ce6549366eeb9569cd3084a3dd7b13bf4114f9e43c04291fe801d1d70b2
diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml
new file mode 100644
index 000000000000..8f92762cc1c9
--- /dev/null
+++ b/app-cdr/tkdvd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+</pkgmetadata>
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..e33352f58784
--- /dev/null
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
+HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
+SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	app-cdr/dvd+rw-tools
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	virtual/cdrtools
+"
+
+S=${WORKDIR}/tkdvd
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PF}/src
+	doins src/*
+
+	insinto /usr/share/${PF}
+	doins TkDVD.sh
+
+	cat <<- EOF >"${T}"tkdvd
+	#!/bin/sh
+	cd /usr/share/${PF}
+	sh TkDVD.sh
+	EOF
+
+	dobin "${T}"tkdvd
+
+	DOCS=( ChangeLog FAQ README TODO doc/config_file )
+	HTML_DOCS=( doc/combobox.html )
+	einstalldocs
+
+	doicon icons/*.png
+}
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
new file mode 100644
index 000000000000..32fa02655c7e
--- /dev/null
+++ b/app-cdr/uif2iso/Manifest
@@ -0,0 +1 @@
+DIST uif2iso-0.1.7c.zip 113727 SHA256 b78dde3e8bc28559f73e2feb46d41c8f57b511ddbe25d63ada704ef8697528ec SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f WHIRLPOOL df4a0446faec70dcb30316a576d49cdf074b042e99a85ccb4dbd0273bc72a5b5a5e37d74c5326728fb80bd34da8783c5dd070c97c9476ff0a1c245b2d5520d56
diff --git a/app-cdr/uif2iso/files/0.1.7-Makefile b/app-cdr/uif2iso/files/0.1.7-Makefile
new file mode 100644
index 000000000000..0b8a2bd95355
--- /dev/null
+++ b/app-cdr/uif2iso/files/0.1.7-Makefile
@@ -0,0 +1,10 @@
+# We replace the makefile since the upstream one is not suitable for
+# us :(
+
+OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
+
+CFLAGS += -DMAGICISO_IS_SHIT
+
+LDLIBS = -lz
+
+uif2iso: $(OBJS)
diff --git a/app-cdr/uif2iso/metadata.xml b/app-cdr/uif2iso/metadata.xml
new file mode 100644
index 000000000000..fadf539e8a0b
--- /dev/null
+++ b/app-cdr/uif2iso/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    uif2iso is a program that can convert images taken with the
+    MagicISO software under Windows, with its proprietary UIF format,
+    into standard ISO9660 images.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
new file mode 100644
index 000000000000..b33613eab5e3
--- /dev/null
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Converts MagicISO CD-images to iso"
+HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/src"
+
+src_compile() {
+	# Yes we use our own makefile, I'll try to explain this to
+	# upstream _again_.
+	emake CC="$(tc-getCC)" -f "${FILESDIR}/0.1.7-Makefile" || die "emake failed"
+}
+
+src_install() {
+	dobin ${PN} || die "failed to install"
+
+	dodoc "${WORKDIR}"/${PN}.txt "${WORKDIR}"/README
+}
diff --git a/app-cdr/webcdwriter/Manifest b/app-cdr/webcdwriter/Manifest
new file mode 100644
index 000000000000..96ec50a3a35d
--- /dev/null
+++ b/app-cdr/webcdwriter/Manifest
@@ -0,0 +1 @@
+DIST webCDwriter-2.8.2.tar.bz2 619761 SHA256 52dd4792ec80b3bd8b6c96e42a00c43d0f73bda5c4277cd065333d279f3f5cf3 SHA512 6dc35439f0dbe3dbc02cf791703904d6f194e4f0d3ba9b19563c109e15a56d94f1999783d0e6093782cd1ab5fbc54605462e9163e2e6a248a206562c9348651b WHIRLPOOL f98bc7e3ce5c9217fd6a62bed2280dad5704094684399c8ebc046a6fea259477903574dcd418629eec6f1de3bcee5037602c4607da233a1c4a6aa4549cc3d105
diff --git a/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch b/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch
new file mode 100644
index 000000000000..3236d74a4b2b
--- /dev/null
+++ b/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch
@@ -0,0 +1,67 @@
+diff -ur webCDwriter-2.8.2.orig/configure webCDwriter-2.8.2/configure
+--- webCDwriter-2.8.2.orig/configure	2007-03-20 15:14:30.000000000 +0200
++++ webCDwriter-2.8.2/configure	2008-06-07 13:56:36.000000000 +0300
+@@ -47,6 +47,9 @@
+ 	--destDir=*)
+ 		DESTDIR=`echo $1 | sed "s:--destDir=::g"`
+ 		;;
++	--javac-flags=*)
++		JAVACFLAGS=`echo $1 | sed "s:--javac-flags=::g"`
++		;;
+ 	--doNotCompileCDWserver)
+ 		doNotCompileCDWserver="on"
+ 		;;
+@@ -105,6 +108,8 @@
+ 
+ --destDir              use a prefix invisible to the installed files
+ 
++--javac-flags          flags for javac
++
+ --doNotCompileCDWserver  if you want to install CDWserver Pro
+ 
+ --doNotCompileWebCDcreator  use the precompiled and signed webCDcreator
+@@ -152,7 +157,7 @@
+ 	}
+ }
+ EOF
+-javac Test.java 2> /dev/null \
++javac ${JAVACFLAGS} Test.java Test0.java \
+ 	&& webCDcreator="webCDcreator.jar $webCDcreator" \
+ 	&& echo " OK -> will build webCDcreator.jar" \
+ 	|| echo " not found -> will use precompiled webCDcreator.jar"
+@@ -284,12 +289,15 @@
+ 	forPluginRSA=""
+ fi
+ 
++echo "JAVACFLAGS=${JAVACFLAGS}"
++
+ cat webCDcreator/Makefile.in \
+ 	| sed s/@nosCert@/"$nosCert"/g \
+ 	| sed s/@sunCert@/"$sunCert"/g \
+ 	| sed s/@all@/"$webCDcreator"/g \
+ 	| sed s/@4pi@/"$forPlugin"/g \
+ 	| sed s/@4ns@/"$forPluginRSA"/g \
++	| sed s_@JAVACFLAGS@_"$JAVACFLAGS"_g \
+ 	> webCDcreator/Makefile
+ 
+ 
+diff -ur webCDwriter-2.8.2.orig/webCDcreator/Makefile.in webCDwriter-2.8.2/webCDcreator/Makefile.in
+--- webCDwriter-2.8.2.orig/webCDcreator/Makefile.in	2007-04-21 01:22:20.000000000 +0300
++++ webCDwriter-2.8.2/webCDcreator/Makefile.in	2008-06-07 13:57:56.000000000 +0300
+@@ -14,6 +14,7 @@
+ 
+ nosCert=@nosCert@
+ sunCert=@sunCert@
++JAVACFLAGS=@JAVACFLAGS@
+ 
+ all: @all@
+ 
+@@ -21,7 +22,7 @@
+ 	$(MAKE) -C icons
+ 
+ webCDcreator.jar: *.java icons/up.jpg
+-	javac -encoding ISO-8859-1 -source 1.4 -target 1.4 *.java
++	javac -encoding ISO-8859-1 ${JAVACFLAGS} *.java netscape/security/*.java
+ 	jar cfm webCDcreator.jar Manifest \
+ 		gpl.html \
+ 		*.class \
diff --git a/app-cdr/webcdwriter/files/configure.patch b/app-cdr/webcdwriter/files/configure.patch
new file mode 100644
index 000000000000..1ea64f7c28df
--- /dev/null
+++ b/app-cdr/webcdwriter/files/configure.patch
@@ -0,0 +1,16 @@
+--- configure.old	2004-05-01 20:45:25.000000000 +0200
++++ configure	2004-09-24 15:07:52.489668584 +0200
+@@ -202,11 +202,11 @@
+ 	MAKE=gmake
+ 	;;
+ Linux)
+-	cxxflags="-D_REENTRANT"
++	cxxflags="$CXXFLAGS -D_REENTRANT"
+ 	if [ "$DEBUG" = "yes" ]; then
+ 		cxxflags="-g $cxxflags"
+ 	else
+-		cxxflags="-O2 $cxxflags"
++		cxxflags=" $cxxflags"
+ 	fi
+ 	lflags="-lcrypt -lpthread"
+ 	if [ "$PRO" = "yes" ]; then
diff --git a/app-cdr/webcdwriter/files/webcdwriter.rc b/app-cdr/webcdwriter/files/webcdwriter.rc
new file mode 100644
index 000000000000..ce02364306c0
--- /dev/null
+++ b/app-cdr/webcdwriter/files/webcdwriter.rc
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting CDWserver"
+        for tool in cdrdao cdrecord mkisofs readcd
+        do
+            if [ -e /usr/bin/$tool ]
+            then
+                cp /usr/bin/$tool /var/CDWserver/bin
+            fi
+        done
+	start-stop-daemon --start --quiet --pidfile /var/run/CDWserver.pid \
+		--exec /usr/sbin/CDWserver
+	eend $?
+	touch /var/lock/subsys/CDWserver
+}
+
+stop() {
+	ebegin "Stopping CDWserver"
+	start-stop-daemon --stop --quiet --pidfile /var/run/CDWserver.pid
+	eend $?
+	rm -f /var/lock/subsys/CDWserver
+}
diff --git a/app-cdr/webcdwriter/metadata.xml b/app-cdr/webcdwriter/metadata.xml
new file mode 100644
index 000000000000..44bbb0fe9738
--- /dev/null
+++ b/app-cdr/webcdwriter/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<herd>java</herd>
+<longdescription>webCDwriter can be used to make the CD- and DVD-writer(s)
+	connected to a Linux box available to all users in your network. It consists
+	of the server CDWserver and the clients webCDcreator and rcdrecord.
+	CDWserver stores the files transmitted by the clients, reserves the
+	CD-writer and controls the CD-writer using cdrecord. webCDcreator is a Java
+	applet that runs within your browser, assists you when putting together a CD
+	and transmits the files.</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.2-r2.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.2-r2.ebuild
new file mode 100644
index 000000000000..272d0622f491
--- /dev/null
+++ b/app-cdr/webcdwriter/webcdwriter-2.8.2-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils java-pkg-2 pam
+
+MY_P=${P/cd/CD}
+
+DESCRIPTION="Make CD-writer(s) available to all users in your network"
+HOMEPAGE="http://joerghaeger.de/webCDwriter/index.html"
+SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pam mp3 sox vorbis"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/jnlp-api"
+RDEPEND=">=virtual/jre-1.4
+	app-cdr/cdrdao
+	virtual/cdrtools
+	mp3? ( media-sound/mpg123 )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	rm -v "${S}"/MD5Verify/*.jar "${S}"/webCDcreator/4plugin/*.jar || die
+}
+
+src_compile() {
+	epatch "${FILESDIR}/configure.patch" "${FILESDIR}"/${PV}-javac-flags.patch
+
+	local myconf
+
+	local java_conf="$(java-pkg_javac-args) -classpath $(java-pkg_getjar --build-only jnlp-api jnlp-api.jar)"
+	java_conf="${java_conf} -encoding ISO-8859-1"
+	use pam || myconf="--pam"
+	myconf="${myconf} --user=root --group=root"
+	./configure ${myconf} --javac-flags="${java_conf}" || die "configure failed"
+	make || die "make failed"
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.rc" CDWserver
+
+	diropts -m700
+	dodir /etc/CDWserver
+	keepdir /var/CDWserver/bin
+	dodir /var/CDWserver/export/Server/tools
+	dodir /var/CDWserver/http/rcdrecord
+	keepdir /var/CDWserver/projects
+	keepdir /var/log/CDWserver
+	keepdir /var/spool/CDWserver
+
+	insinto /etc/CDWserver
+
+	PORT="12411"
+	if use mp3
+	then
+		MP3="on"
+	else
+		MP3="off"
+	fi
+	if use vorbis
+	then
+		OGG="on"
+	else
+		OGG="off"
+	fi
+	if use sox
+	then
+		AUDIO="on"
+	else
+		AUDIO="off"
+	fi
+
+	cd "${S}"/CDWserver/config
+	cat config.default \
+		| sed s*#portNo=12411*portNo=${PORT}*g \
+		| sed s*#MP3decoding=on*MP3decoding=${MP3}*g \
+		| sed s*"# ogg123"*oggDecoding=${OGG}*g \
+		| sed s*#audioCDSupport=on*audioCDSupport=${AUDIO}*g \
+		> config
+	for name in `find -name '[!M]*' -type f`
+	do
+		doins ${name}
+	done
+
+	cd "${S}"/CDWserver/http
+	for dirname in `find -type d`
+	do
+		cd "${S}"/CDWserver/http/${dirname}
+		dodir /var/CDWserver/http/${dirname}
+		insinto /var/CDWserver/http/${dirname}
+		for name in `find -name '[!M]*' -type f`
+		do
+			doins ${name}
+		done
+	done
+
+	cd "${S}"/CDWserver/test
+	make || die "make -C CDWserver/test failed"
+	for name in `find -type f -perm -111`
+	do
+		dobin ${name}
+	done
+
+	insinto /var/CDWserver/http/rcdrecord
+
+	cd "${S}"/rcdrecord
+	for name in `find -name '*.html'`
+	do
+		doins ${name}
+	done
+
+	cd "${S}"/webCDcreator
+	cp start.html index.html
+	for dirname in `find -type d`
+	do
+		cd "${S}"/webCDcreator/${dirname}
+		dodir /var/CDWserver/http/webCDcreator/${dirname}
+		insinto /var/CDWserver/http/webCDcreator/${dirname}
+		for name in `find -type f`
+		do
+			if test "${name}" != Makefile
+			then
+				doins ${name}
+			fi
+		done
+	done
+
+	cd "${S}"/tools
+	make || die "make -C tools failed"
+	mv CDWconfig.sh.tmp "${S}"/CDWserver/CDWconfig.sh
+
+	cd "${S}"
+
+	dosbin "${S}"/CDWserver/CDWconfig.sh
+	dosbin "${S}"/CDWserver/CDWserver
+	dobin "${S}"/CDWserver/CDWrootGate
+	dobin "${S}"/CDWserver/CDWverify
+#	dobin "${S}"/CDWserver/setScheduler
+	dobin "${S}"/rcdrecord/rcdrecord
+
+	dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd
+	dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd
+	dosym /usr/bin/rcdrecord /usr/bin/files2cd
+	dosym /usr/bin/rcdrecord /usr/bin/image2cd
+
+	# back to defaults from -m700
+	diropts -m755
+	java-pkg_regjar "${D}"/var/CDWserver/http/webCDcreator/*.jar
+
+	java-pkg_jarinto /var/CDWserver/export/Server/tools
+	java-pkg_dojar "${S}/MD5Verify/MD5Verify.jar"
+
+	dodoc ChangeLog README CREDITS || die
+	dohtml *.html || die
+
+	use pam && pamd_mimic system-auth cdwserver auth account password session
+}
+
+pkg_postinst() {
+	# ripped from the makefile
+	local PORTEXT
+	if [ "${PORT}" == "80" ]
+	then
+		PORTEXT=""
+	else
+		PORTEXT=":${PORT}"
+	fi
+	elog "To do:"
+	elog "1. Enter \"/etc/init.d/CDWserver start\" to start your webCDwriter"
+	elog "2. Open your web browser and try"
+	elog "   \"http://127.0.0.1${PORTEXT}\" or \"http://`hostname`${PORTEXT}\""
+	elog "to check the status of your webCDwriter"
+#	elog "3. Run \"/usr/sbin/CDWconfig.sh\" to set the rights of CDWserver"
+	echo
+	ewarn "Remember to setup /etc/CDWserver/config"
+}
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
new file mode 100644
index 000000000000..bf6bd404669c
--- /dev/null
+++ b/app-cdr/xbiso/Manifest
@@ -0,0 +1 @@
+DIST xbiso-0.6.1.tar.gz 49698 SHA256 5d7a051e2dc3d7ff07ac75ce6e6625e7aaaed4ca439401275ce54e96dc531c92 SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc WHIRLPOOL f2cb7e644b087710b4ceb5c21c940396ce117be36861eb7e76943e3f9a02827f85072a04ad225514b931f75467cf910f0c957726ac996f09f7ca56748055fe80
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
new file mode 100644
index 000000000000..5b48ba674230
--- /dev/null
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig	2014-12-02 18:56:23.000000000 +0300
++++ configure.in	2014-12-02 19:09:46.724190436 +0300
+@@ -6,13 +6,13 @@
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lftp:
+-AC_CHECK_LIB(ftp, main,[LIBS="-DUSE_FTP -lftp"],AC_MSG_WARN([Warning libftp not found ftp features disabled]))
+ AC_CHECK_LIB(m, ceil,[LIBS="$LIBS -lm"],AC_MSG_ERROR([Error mlib is required]))
+-AC_ARG_ENABLE(ftp,
+-[
++AC_ARG_ENABLE([ftp],
++    AS_HELP_STRING([--disable-ftp],[Disables all ftp features and libftp dependencies]))
+ 
+-  --disable-ftp			Disables all ftp features and libftp dependencies
+-],[LIBS=""])
++AS_IF([test "x$enable_ftp" != "xno"], [
++    AC_SEARCH_LIBS([FtpInit],[ftp],[CPPFLAGS+="-DUSE_FTP"],AC_MSG_ERROR([libftp not found]))
++])
+ 
+ dnl Checks for header files.
+ AC_CONFIG_HEADERS([config.h:config.h.in])
diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml
new file mode 100644
index 000000000000..d580470d000b
--- /dev/null
+++ b/app-cdr/xbiso/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>media-optical</herd>
+  <longdescription>Tools for manipulating Xbox ISO images</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">xbiso</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..b279998a84b9
--- /dev/null
+++ b/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit flag-o-matic
+
+DESCRIPTION="Xbox xdvdfs ISO extraction utility"
+HOMEPAGE="http://sourceforge.net/projects/xbiso/"
+SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="net-libs/ftplib"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
+}
+
+src_configure() {
+	# for this package, interix behaves the same as BSD
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
+
+	default
+}
+
+src_install() {
+	dobin xbiso
+	dodoc CHANGELOG README
+}
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..21fe5509de72
--- /dev/null
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Xbox xdvdfs ISO extraction utility"
+HOMEPAGE="http://sourceforge.net/projects/xbiso/"
+SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ftp"
+
+RDEPEND="ftp? ( <net-libs/ftplib-4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
+	epatch "${FILESDIR}/${P}-libs.patch"
+	mv configure.in configure.ac || die #426262
+	eautoreconf
+}
+
+src_configure() {
+	# for this package, interix behaves the same as BSD
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
+
+	econf \
+		$(use_enable ftp)
+}
+
+src_install() {
+	dobin xbiso
+	dodoc CHANGELOG README
+}
diff --git a/app-cdr/xbiso/xbiso-0.6.1.ebuild b/app-cdr/xbiso/xbiso-0.6.1.ebuild
new file mode 100644
index 000000000000..a7cea46f60b3
--- /dev/null
+++ b/app-cdr/xbiso/xbiso-0.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit flag-o-matic
+
+DESCRIPTION="Xbox xdvdfs ISO extraction utility"
+HOMEPAGE="http://sourceforge.net/projects/xbiso/"
+SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_compile() {
+	# for this package, interix behaves the same as BSD
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
+
+	econf
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin xbiso || die "dobin failed."
+	dodoc CHANGELOG README
+}
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
new file mode 100644
index 000000000000..a3a0f00c6f53
--- /dev/null
+++ b/app-cdr/xcdroast/Manifest
@@ -0,0 +1 @@
+DIST xcdroast-0.98alpha16.tar.gz 3563666 SHA256 a2b96bb9799b5880befe2d01c5e6a0b63110dd61f59384935b750e72bc73984d SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7 WHIRLPOOL 06536da5dd32001ac71d9e6c9ef66869f2a14660b272cf9e711556a74d6e1bbbcb9eb6508a51a74e2f366933e5f43ca6fc5cea582fe0e96e459a66a9ec3c199d
diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch
new file mode 100644
index 000000000000..cd001e0ee7bf
--- /dev/null
+++ b/app-cdr/xcdroast/files/cdda2wav_version.patch
@@ -0,0 +1,54 @@
+diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c
+--- xcdroast-0.98+0alpha16~/src/io.c	2008-08-21 15:11:40.000000000 +0200
++++ xcdroast-0.98+0alpha16/src/io.c	2009-12-29 22:54:08.571188849 +0100
+@@ -10062,6 +10062,7 @@
+ 
+ gint check_version_cdda2wav(gchar *match, gchar *found) {
+ gchar line[MAXLINE];
++gchar vline[MAXLINE];
+ gchar ver[MAXLINE];
+ FILE *fpin;
+ gchar *p;
+@@ -10076,32 +10077,38 @@
+         }
+ 
+ 	strcpy(line,"");
++	strcpy(vline,"");
+         for (;;) {
+                 if (fgets(line,MAXLINE,fpin) == NULL) 
+                         break;
+ 		dodebug(10,"got: %s",line);
++
++	        /* only get first line */
++        	if (strcmp(vline,"") == 0) {
++                	strncpy(vline, line, MAXLINE);
++        	}
+         }
+ 
+         if (pclose(fpin) == -1) {
+                 g_error("pclose error\n");
+         }
+ 
+-	if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
++	if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
+ 		/* failed to open - permission denied */
+ 		return 2;
+ 	}
+ 
+-	/* now line contains the version string of cdda2wav */
++	/* now vline contains the version string of cdda2wav */
+ 	/* try to extract the version number */
+ 
+-	p = strstr(line,"version");
++	p = strstr(vline,"version");
+ 	if (p != NULL) {
+ 		p = strtok(p+8, " _");
+ 		if (p != NULL) {
+ 			strcpy(ver,p);
+ 		}
+ 	} else {
+-		p = strstr(line,"cdda2wav");
++		p = strstr(vline,"cdda2wav");
+ 		if (p != NULL) {
+ 			p = strtok(p+9, " ");
+ 			if (p != NULL) {
diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
new file mode 100644
index 000000000000..d2e15ef54c69
--- /dev/null
+++ b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
@@ -0,0 +1,45 @@
+--- src/io.c
++++ src/io.c
+@@ -2665,6 +2665,8 @@
+ 		g_error("Unexpected output in cdda2wav toc-output\n");
+ 	}
+ 	trackinfo[tocnr]->track_nr = atoi(p1);
++	if (trackinfo[tocnr]->track_nr == 0)
++		cdinfo.nr_tracks++;
+ 	trackinfo[tocnr]->isosize = -1;
+ 
+ 	/* reststring into tmp2 - strip to remove leading spaces */
+@@ -8401,6 +8403,9 @@
+ 		if (extract_quoted(tmp) != 0) 
+ 			return;
+ 
++		if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0)
++			matchnr++;
++
+ 		if (mode == 0) {
+ 			if (matchnr >= cdinfo.nr_tracks) {
+ 				g_warning("invalid track count from cddb-server\n");
+@@ -8482,14 +8487,20 @@
+ 
+ 	/* build of command line */
+ 	if (mode == 0 || mode == 2) {
++		gint	ntr = cdinfo.nr_tracks;
++
++		if (ntr > 0 && trackinfo[0]->track_nr == 0)
++			ntr--;
+ 		g_snprintf(tmp,MAXLINE,"cddb query %s %d ",
+-			cdinfo.cddb_discid, cdinfo.nr_tracks);
++			cdinfo.cddb_discid, ntr);
+ 		for (i = 0; i < cdinfo.nr_tracks; i++) {
++			if (trackinfo[i]->track_nr == 0)
++				continue;
+ 			g_snprintf(tmp2,MAXLINE,"%d ",
+ 				trackinfo[i]->start_sec + 150);
+ 			strcat(tmp,tmp2);
+ 		}
+-		g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75);
++		g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75);
+ 		strcat(tmp,tmp2);
+ 	} else {
+ 		/* get data from toc file */
+
diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch
new file mode 100644
index 000000000000..7285bd335df0
--- /dev/null
+++ b/app-cdr/xcdroast/files/io_compile.patch
@@ -0,0 +1,21 @@
+--- src/io.c.org	2009-02-24 09:38:27.000000000 +0100
++++ src/io.c	2009-02-24 09:45:18.000000000 +0100
+@@ -1903,7 +1903,8 @@
+ 	}
+ 
+ 	strcpy(str,"");
+-	fgets(str,MAXLINE,fpin); 
++	if (fgets(str,MAXLINE,fpin) == NULL)
++                g_error("fgets error\n");
+ 
+         if (pclose(fpin) == -1) {
+                 g_error("pclose error\n");
+@@ -4720,7 +4721,7 @@
+ 	dolog(3, "Saving extended output to %s\n", fname);
+ 
+ 	/* write to file */
+-	fd = open(fname,O_WRONLY | O_CREAT);
++	fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ 	if (fd < 0) {
+ 		g_warning("Can't open file %s for writing\n",fname);
+ 		return 1;
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
new file mode 100644
index 000000000000..a180a61abbc4
--- /dev/null
+++ b/app-cdr/xcdroast/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-optical</herd>
+	<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xcdroast</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r1.ebuild
new file mode 100644
index 000000000000..6792f533782e
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit gnome2-utils eutils
+
+DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
+HOMEPAGE="http://www.xcdroast.org/"
+SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2:2
+	app-cdr/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+	epatch "${FILESDIR}"/cdda2wav_version.patch \
+	  "${FILESDIR}"/fix_cddb_hidden_tracks.patch \
+	  "${FILESDIR}"/io_compile.patch
+
+	# fix Norwegian locales
+	mv po/{no,nb}.po || die
+	mv po/{no,nb}.gmo || die
+	sed -i -e 's/no/nb/' po/LINGUAS || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-gtk2 \
+		--disable-dependency-tracking \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc
+}
+
+src_compile() {
+	emake PREFIX=/usr || die
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README doc/{README*,DOCUMENTATION,FAQ,TRANS*} \
+		doc/manual/README.txt
+
+	insinto /usr/share/doc/${PF}/manual
+	doins doc/manual/xcdroast-manual.pdf
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins xpms/xcdricon.xpm xcdroast.xpm
+
+	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild
new file mode 100644
index 000000000000..84391499a793
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit gnome2-utils eutils
+
+DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
+HOMEPAGE="http://www.xcdroast.org/"
+SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="nls"
+
+RDEPEND=">=x11-libs/gtk+-2:2
+	app-cdr/cdrtools"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_/}
+
+src_prepare() {
+	epatch "${FILESDIR}"/io_compile.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-gtk2 \
+		--disable-dependency-tracking \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc
+}
+
+src_compile() {
+	emake PREFIX=/usr || die
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog README doc/{README*,DOCUMENTATION,FAQ,TRANS*} \
+		doc/manual/README.txt
+
+	insinto /usr/share/doc/${PF}/manual
+	doins doc/manual/xcdroast-manual.pdf
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins xpms/xcdricon.xpm xcdroast.xpm
+
+	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-cdr/xdvdfs-tools/Manifest b/app-cdr/xdvdfs-tools/Manifest
new file mode 100644
index 000000000000..5b9c58c6df3f
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/Manifest
@@ -0,0 +1 @@
+DIST XDVDFSToolsv2.1.rar 211193 SHA256 ad9603564597004151812302074408a60c54cabcc19e843e1186b5a506eb068f SHA512 c3158dc603ac363cadc2dcc99fd112ef66be6ae8fa4f89544cbf4c5a6490cace82cf1d16fa748ede4d206359e2e6752ffd6bfe074ad3c48f9a829e4938f1e99d WHIRLPOOL 2b746fd49df10d0eb212c6aa91a88abdf2214c56d3eabc496e34ae58faf7aff0a921e72d3a9547b225823792dfdcc45617d78dacfb7d5d21c0b58f21eec441f5
diff --git a/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch b/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
new file mode 100644
index 000000000000..4d06822eb06c
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
@@ -0,0 +1,17 @@
+--- XDVDFS_Tools.orig/src/xdvdfs/xdvdfs.c	2003-08-15 23:26:58.000000000 +0000
++++ XDVDFS_Tools/src/xdvdfs/xdvdfs.c	2005-05-21 12:13:55.655839216 +0000
+@@ -157,6 +157,14 @@
+ 	memcpy(SearchRecord->Filename, Entry->Filename, Entry->FilenameLength);
+ 	SearchRecord->Filename[Entry->FilenameLength] = 0;
+ 
++	if (strstr(SearchRecord->Filename,"..") || 
++	    strchr(SearchRecord->Filename, '/') || 
++	    strchr(SearchRecord->Filename, '\\'))
++	  {
++	    printf("Filename contains invalid characters\n");
++	    exit(1);
++	  }
++
+ 	// Copy file parameters in the search_rec
+ 	SearchRecord->Attributes = Entry->FileAttributes;
+ 	SearchRecord->FileSize = ENDIAN_SAFE32(Entry->FileSize);
diff --git a/app-cdr/xdvdfs-tools/metadata.xml b/app-cdr/xdvdfs-tools/metadata.xml
new file mode 100644
index 000000000000..14dba77325f5
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>xbox</herd>
+  <longdescription>Tools for manipulating Xbox ISO images</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild
new file mode 100644
index 000000000000..6700a32e485d
--- /dev/null
+++ b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for manipulating Xbox ISO images"
+HOMEPAGE="http://www.layouts.xbox-scene.com/"
+SRC_URI="http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv${PV}.rar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="|| ( app-arch/unrar app-arch/rar )"
+RDEPEND=""
+
+S=${WORKDIR}/XDVDFS_Tools/src
+
+src_unpack() {
+	unpack ${A}
+	mv "XDVDFS Tools" XDVDFS_Tools
+	sed -i \
+		-e '/^LDFLAGS = -s/d' \
+		-e '/^CCFLAGS =/s:=.*:= ${CFLAGS} ${CPPFLAGS}:g' \
+		-e "/^CC =/s:=.*:=$(tc-getCC):" \
+		"${S}"/makefile.prefab
+	epatch "${FILESDIR}"/${P}-fnamefix.patch
+	mkdir "${S}"/xdvdfs_extract/output "${S}"/xdvdfs_maker/output
+}
+
+src_compile() {
+	local d
+	for d in xdvdfs_{dumper,extract,maker} ; do
+		emake -C ${d} || die
+	done
+}
+
+src_install() {
+	dobin xdvdfs_dumper/output/xdvdfs_dumper || die "xdvdfs_dumper"
+	dobin xdvdfs_extract/output/xdvdfs_extract || die "xdvdfs_extract"
+	dobin xdvdfs_maker/output/xdvdfs_maker || die "xdvdfs_maker"
+	dohtml ../documentation/*.htm
+	dodoc ../Readme.txt
+}
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
new file mode 100644
index 000000000000..c9dbe1ef0363
--- /dev/null
+++ b/app-cdr/xfburn/Manifest
@@ -0,0 +1,2 @@
+DIST xfburn-0.5.2.tar.bz2 760833 SHA256 63682aab3c30c77e464b2b3b84606d1e1dcefc98e7042072fa09b729d6f84412 SHA512 3c6f27e2c8e5200d620bf32f938a1fb044b371a9fe0b5474ba8c1a487c79a7761e144ec8490f04c2389c96bc980b9f2bdfebce9d24dea30c5caae451bb9dcf5e WHIRLPOOL a88f482d899ecaf89666f34b583b90b02f080ec2dc074f4809b98c8e65a824f3f229dd006c8ccbcd3c580e3c3885bea0a0c9fa04ef8871071b6bc9e237029164
+DIST xfburn-0.5.4.tar.bz2 773300 SHA256 9a0053ff106ae475871a2bed328d5d7c5a2fc4280a24e956ca85b6a13a9fc1f6 SHA512 66bd82aa80fcd53d5d505b01a33cdbffdcf547a05a11bdbe688387420ee682a28564397acaf85a52852625909648c01cc18f289736ac54d2806725f46c875481 WHIRLPOOL 06d77abf0b0cca28306a67dd0703557c38b40f57df8511a49be1850db0c3097ee8d47377f50d4a2cfbf3312873e93f147d70cdb43eab014f04f8412ed8ed747c
diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml
new file mode 100644
index 000000000000..9251991fca79
--- /dev/null
+++ b/app-cdr/xfburn/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>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+  <herd>media-optical</herd>
+  <upstream>
+    <maintainer>
+      <email>mario@xfce.org</email>
+    </maintainer>
+  </upstream>
+  <upstream>
+    <maintainer>
+      <email>bugs@da.mcbf.net</email>
+      <name>David Mohr</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-cdr/xfburn/xfburn-0.5.2.ebuild b/app-cdr/xfburn/xfburn-0.5.2.ebuild
new file mode 100644
index 000000000000..b537f3aba14e
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.5.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
+IUSE="debug gstreamer +udev"
+
+RDEPEND=">=dev-libs/glib-2.32
+	>=dev-libs/libburn-0.4.2
+	>=dev-libs/libisofs-0.6.2
+	>=x11-libs/gtk+-2.24:2
+	>=xfce-base/exo-0.6
+	>=xfce-base/libxfce4ui-4.10
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/app-cdr/xfburn/xfburn-0.5.4.ebuild b/app-cdr/xfburn/xfburn-0.5.4.ebuild
new file mode 100644
index 000000000000..2329ba0f32d8
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~ppc x86"
+IUSE="debug gstreamer +udev"
+
+RDEPEND=">=dev-libs/glib-2.32:=
+	>=dev-libs/libburn-0.4.2:=
+	>=dev-libs/libisofs-0.6.2:=
+	>=x11-libs/gtk+-2.24:2=
+	>=xfce-base/exo-0.6:=
+	>=xfce-base/libxfce4ui-4.10:=
+	gstreamer? (
+		media-libs/gstreamer:1.0=
+		media-libs/gst-plugins-base:1.0= )
+	udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
author	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 13:49:04 -0700
committer	Robin H. Johnson <robbat2@gentoo.org>	2015-08-08 17:38:18 -0700
commit	56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree	3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-cdr
download	gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip