diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
new file mode 100644
index 0000000..0181cef
--- /dev/null
+++ b/dev-libs/libcdio/Manifest
@@ -0,0 +1,5 @@
+AUX libcdio-1.0.0-cddb.patch 948 SHA256 6c067a244d1bd6b0f8de4dada570a535b18e5d66f9e0fedc8da33a42893937fb SHA512 248f02bc2c30c5b8752f2bb6341bd42b9f13b7f112a3b157ce05bbc2ac9562e5dcfe9d98f4531687efbfbdfdcf68c31de21a06605515119e5a631b7fb1de40cb WHIRLPOOL 850b9efc91c6acdd1cb476de3b3c1a8d06375c5c0a9bc72d959af0a4854b4c61f4b85bf16a16ee0370e4aedc4ceb96469901a6754651d897ed70f511892fb15e
+AUX libcdio-1.0.0-version.patch 613 SHA256 b62106be928dcced85d346bd8bcb80afce4f562dfd4110ce77d6460382eb6d34 SHA512 6dc238f442fad3f0b35350fd11aa75bcdbc364cbc3616b4d61e9d53ff9b36b0293ce7e9e2118e07045399cd4a06fa5474870794326f11df98f3e218b74cef822 WHIRLPOOL b7339c0ffaee9347dbe3e77036c791769f2b3c8f706cebd877d894a3204e409f8907d89e569a5a2a37fce608ca0c1990ac76245278634ed934bc5e1de640cd78
+DIST libcdio-1.0.0.tar.gz 2343992 SHA256 fe080bc3cb7a57becdecf2b392bf39c24df0211f5fdfddfe99748fa052a7e231 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc WHIRLPOOL 4a769a1202b9fbded34ba1de42a9409dad2d34f6f84d0884d6b5b3a091cc4405fca3e1989bf68ef3aefcad405bbb01c98a9101ee14e0ba1cd5cf9b74c8bc8aa1
+EBUILD libcdio-1.0.0-r1.ebuild 1994 SHA256 2326d8aaf5078013d11a0fdfd1d55b34c7c47118be286cc95197ee2f4265e801 SHA512 95efc6c26d694d3afca4ae0a15fe6e04501c1bd87b8a0cdfbbbf27f41bf934cf9017551e3bd0ec708647cd66e5bc15b8de18ad596c363456c86f4df092c7f93b WHIRLPOOL 39793da5f2f9e594124eaaad1a4046f432dda6f5d81c3f2700c89e280ab2980840a382126010aea27aa4f0c23bd9d4a25990a77a7d16d69916eb679a731cd8b8
+MISC metadata.xml 528 SHA256 7d1df8dc8c56ebe30a0c1d2f986baed96fb7d6319bf73e84deb438b87473133b SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9 WHIRLPOOL 5a07db691fa332ddc6baf55908aac29455e54fd2694523d12a53c7961e91cbd652d7a66f556235f26d8a7673bbe5ce8da2b180db3cd0cef5b2f3506bb783df16
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
new file mode 100644
index 0000000..b64991b
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
@@ -0,0 +1,23 @@
+diff -Naur libcdio-1.0.0.orig/src/cdda-player.c libcdio-1.0.0/src/cdda-player.c
+--- libcdio-1.0.0.orig/src/cdda-player.c 2017-11-22 02:39:49.000000000 +0100
++++ libcdio-1.0.0/src/cdda-player.c 2017-11-24 16:16:39.652704315 +0100
+@@ -531,8 +531,8 @@
+ get_cddb_disc_info(CdIo_t *p_cdio)
+ {
+ #ifdef HAVE_CDDB
+- b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
+- i_tracks, &i_cddb_matches);
++ b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
++ i_tracks_global, &i_cddb_matches);
+ if (b_db) {
+ int i_year;
+ i_year = atoi(year);
+@@ -831,7 +831,7 @@
+ {
+ #ifdef HAVE_CDDB
+ cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
+- i_track - i_first_track);
++ i_track - i_first_track_global);
+ if (t) {
+ cddb_track_set_title(t, title);
+ cddb_track_set_artist(t, artist);
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
new file mode 100644
index 0000000..3c812a9
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
@@ -0,0 +1,16 @@
+--- libcdio-1.0.0/configure.ac
++++ libcdio-1.0.0/configure.ac
+@@ -32,7 +32,12 @@
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+ [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
+
+-LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++# Broken by design. See also
++# https://savannah.gnu.org/bugs/?52491
++# and
++# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
++#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
++LIBCDIO_VERSION_NUM=10000
+ AC_SUBST(LIBCDIO_VERSION_NUM)
+
+ AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
new file mode 100644
index 0000000..5126091
--- /dev/null
+++ b/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools libtool ltprune multilib-minimal
+
+DESCRIPTION="A library to encapsulate CD-ROM reading and control"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/17" # subslot is based on SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cddb +cxx minimal static-libs test"
+
+RDEPEND="
+ !minimal? (
+ >=sys-libs/ncurses-5.7-r7:0=
+ cddb? ( >=media-libs/libcddb-1.3.2 )
+ )
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ sys-apps/sed
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cdio/cdio_config.h
+ /usr/include/cdio/version.h
+)
+
+PATCHES=( "${FILESDIR}/${P}-version.patch"
+ "${FILESDIR}/${P}-cddb.patch"
+ )
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ sed \
+ -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+ -i configure || die
+
+ elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
+}
+
+multilib_src_configure() {
+ local util_switch
+ if ! multilib_is_native_abi || use minimal ; then
+ util_switch="--without"
+ else
+ util_switch="--with"
+ fi
+
+ # Tests fail if ECONF_SOURCE is not relative
+ ECONF_SOURCE="../${P}" econf \
+ --disable-maintainer-mode \
+ $(use_enable cxx) \
+ --disable-cpp-progs \
+ --disable-example-progs \
+ $(use_enable static-libs static) \
+ $(use_enable cddb) \
+ --disable-vcd-info \
+ ${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libcdio/metadata.xml b/dev-libs/libcdio/metadata.xml
new file mode 100644
index 0000000..97bb0a0
--- /dev/null
+++ b/dev-libs/libcdio/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ sound@gentoo.org
+ Gentoo Sound project
+
+
+
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 72869bb..d3e7772 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,9 @@
AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 SHA256 e577983238042a04fc0c874b3885e3d9ac01f19c756539747e89f1a47d25236d SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b WHIRLPOOL 09b6ac2a3b6959163a94d1981ed93d4542923cfd4305cc458f20190848d02422b70a22de6b67ee061525f7cec00f1a43f1a645142ca62ff6d268f7fb886f4424
DIST claws-mail-3.15.0.tar.xz 5665648 SHA256 4e4d2d0d43f8ae3d4623408612f5979e9a697ccbc12038b80dd27802e868dc2e SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8 WHIRLPOOL 18c041a770a14c9f5c87d086965b302e2ced8aee8954ed6e3d7934ce011053b7dca8ee13958dc4485172344d70fc0facbf10cc7e62ea8f8feadbd12ba4980cb4
DIST claws-mail-3.15.1.tar.xz 5665468 SHA256 8d093c2f32db863c1141d56e35424c04ee48fe5d6adf4c7f349f647fa3149542 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c WHIRLPOOL 85f96c421954f7b1e28a301dcfd074b316be2e221936d04c11552eec2897e7f46389df29bbca04f68c052f8ce971b5ff85e2882b9372d838e429724f9dee51be
+DIST claws-mail-3.16.0.tar.xz 5913948 SHA256 c212133d3d962129d8c7995c1c7d973faef2a8914481c0c74578217bf4c897ab SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e WHIRLPOOL 875ed7f49010a6926c1026a7d9c902ffd509641576e2785b0e93bb920cb2e80ee1208429f2a76a1d9eeff0047b2887c61ba71693bac050e2c14cec15827f41f7
EBUILD claws-mail-3.15.0-r1.ebuild 5792 SHA256 48798b1e5c35a3f5d4bb96db0568d2f68e33586ffb831a34987b31f8fe91d933 SHA512 87f97b2209b5addd9b0ef2f168dc2bdfa139d6fc9741aab37eca5d25b0ee38bf9564160e4e4a5fd986d8904c08e67684d61b9b1da0785c6f3b17595a522515e9 WHIRLPOOL 862394cdd795b0369e8556b2a60b764ad59cd2a3f996ae11b496351ad205b69b6b900f23fec8c7bb7429dbcfd5110b5e72d3d3774bce7f010a1c0a04922d9e2f
EBUILD claws-mail-3.15.0.ebuild 5660 SHA256 47f3d7dd0d543c2cd5ad220a0f30858c5959baf30ae30276b15e715082991247 SHA512 e67a28cdd5df9dc1578f90995ddc5a21db74aaab743d589fef6f2b19faff649afe2b271255d772aa4ca80d901fb5fa434d75c228e3e2e1851c676b37c6edf28b WHIRLPOOL b7e3bba13fc3001dbf84e4bdf2167f3f3f758876298143e8000485ef378122b341070d9503c70e51d7417b33cd1579a5e953940db18c4a51d566392e4e338c92
EBUILD claws-mail-3.15.1.ebuild 5793 SHA256 77f6a14f1aa51467f4162ad997e3bb46e1ba77a850b1de091f2120e2dbea3cc1 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf WHIRLPOOL 38e97bd483d1dd9a8bf772d1ca843106e328044d0afdac5760d601521e8a61aba6210132a61b8123235d07342324b4ed7d22c78906c129690e46b8de625953af
+EBUILD claws-mail-3.16.0.ebuild 5793 SHA256 77f6a14f1aa51467f4162ad997e3bb46e1ba77a850b1de091f2120e2dbea3cc1 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf WHIRLPOOL 38e97bd483d1dd9a8bf772d1ca843106e328044d0afdac5760d601521e8a61aba6210132a61b8123235d07342324b4ed7d22c78906c129690e46b8de625953af
MISC metadata.xml 1716 SHA256 03affd8bce08eb15ad9ac63fc054ccf16a439e7592bf7e117c93601eec7c71b7 SHA512 2246148a5fe3ecd1b097a1037ba08ef2c175b7d93ceaeb7e9b2a49b9397a47e9f98e4a510f3f2224e94a3aa7982af2b77df2c917496a01c44602e866924b3a5b WHIRLPOOL 51d87dcec02ddb09e05a409d7d5723c1e92d7b9d26b304ef0986c73c83d9ad636d76976034be80e85eb7f8ba89b4f9b481ce3ca7491d892b3a8d3acc784bb0d0
diff --git a/mail-client/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
new file mode 100644
index 0000000..08b309f
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
+ libindicate? ( notification )
+ libnotify? ( notification )
+ networkmanager? ( dbus )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ smime? ( pgp )"
+
+COMMONDEPEND="
+ net-mail/ytnef
+ archive? (
+ app-arch/libarchive
+ >=net-misc/curl-7.9.7
+ )
+ bogofilter? ( mail-filter/bogofilter )
+ calendar? (
+ >=dev-libs/libical-2.0.0
+ >=net-misc/curl-7.9.7
+ )
+ dbus? ( >=dev-libs/dbus-glib-0.60 )
+ gdata? ( >=dev-libs/libgdata-0.17.2 )
+ gnutls? ( >=net-libs/gnutls-3.0 )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( >=x11-libs/gtk+-2.20:2 )
+ imap? ( >=net-libs/libetpan-0.57 )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ nls? ( >=sys-devel/gettext-0.18 )
+ nntp? ( >=net-libs/libetpan-0.57 )
+ notification? (
+ dev-libs/glib:2
+ libcanberra? ( media-libs/libcanberra[gtk] )
+ libindicate? ( dev-libs/libindicate:3[gtk] )
+ libnotify? ( x11-libs/libnotify )
+ )
+ pda? ( >=app-pda/jpilot-0.99 )
+ pdf? ( app-text/poppler[cairo] )
+ pgp? ( >=app-crypt/gpgme-1.0.0 )
+ session? (
+ x11-libs/libICE
+ x11-libs/libSM
+ )
+ smime? ( >=app-crypt/gpgme-1.0.0 )
+ spam-report? ( >=net-misc/curl-7.9.7 )
+ spell? ( >=app-text/enchant-1.0.0 )
+ startup-notification? ( x11-libs/startup-notification )
+ svg? ( >=gnome-base/librsvg-2.40.5 )
+ valgrind? ( dev-util/valgrind )
+ webkit? ( net-libs/webkit-gtk:2 )
+"
+
+DEPEND="${COMMONDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+ app-misc/mime-types
+ x11-misc/shared-mime-info
+ clamav? ( app-antivirus/clamav )
+ networkmanager? ( net-misc/networkmanager )
+ pdf? ( app-text/ghostscript-gpl )
+ perl? ( dev-lang/perl:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.3
+ )
+ rss? (
+ dev-libs/libxml2
+ net-misc/curl
+ )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # Don't use libsoup-gnome (bug #565924)
+ export HAVE_LIBSOUP_GNOME=no
+
+ local myeconfargs=(
+ --disable-bsfilter-plugin
+ --disable-fancy-plugin
+ --disable-generic-umpc
+ --enable-acpi_notifier-plugin
+ --enable-address_keeper-plugin
+ --enable-alternate-addressbook
+ --enable-att_remover-plugin
+ --enable-attachwarner-plugin
+ --enable-fetchinfo-plugin
+ --enable-mailmbox-plugin
+ --enable-newmail-plugin
+ --enable-tnef_parse-plugin
+ --with-password-encryption=$(usex gnutls gnutls old)
+ $(use_enable archive archive-plugin)
+ $(use_enable bogofilter bogofilter-plugin)
+ $(use_enable calendar vcalendar-plugin)
+ $(use_enable clamav clamd-plugin)
+ $(use_enable dbus)
+ $(use_enable debug crash-dialog)
+ $(use_enable doc manual)
+ $(use_enable gdata gdata-plugin)
+ $(use_enable gnutls)
+ $(use_enable gtk3)
+ $(use_enable ipv6)
+ $(use_enable ldap)
+ $(use_enable networkmanager)
+ $(use_enable nls)
+ $(use_enable notification notification-plugin)
+ $(use_enable pda jpilot)
+ $(use_enable pdf pdf_viewer-plugin)
+ $(use_enable perl perl-plugin)
+ $(use_enable pgp pgpcore-plugin)
+ $(use_enable pgp pgpinline-plugin)
+ $(use_enable pgp pgpmime-plugin)
+ $(use_enable python python-plugin)
+ $(use_enable rss rssyl-plugin)
+ $(use_enable session libsm)
+ $(use_enable sieve managesieve-plugin)
+ $(use_enable smime smime-plugin)
+ $(use_enable spam-report spam_report-plugin)
+ $(use_enable spamassassin spamassassin-plugin)
+ $(use_enable spell enchant)
+ $(use_enable startup-notification)
+ $(use_enable svg)
+ $(use_enable valgrind valgrind)
+ $(use_enable webkit fancy-plugin)
+ $(use_enable xface compface)
+ )
+
+ # libetpan is needed if user wants nntp or imap functionality
+ if use imap || use nntp ; then
+ myeconfargs+=( --enable-libetpan )
+ else
+ myeconfargs+=( --disable-libetpan )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+ default
+
+ # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+ # => also install it in /usr/share/pixmaps for other desktop envs
+ # => also install higher resolution icons in /usr/share/icons/hicolor/...
+ insinto /usr/share/pixmaps
+ doins ${PN}.png
+ local size
+ for size in 64 128 ; do
+ newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+ done
+
+ docinto tools
+ dodoc tools/README*
+
+ domenu ${PN}.desktop
+
+ einfo "Installing extra tools"
+ cd "${S}"/tools
+ exeinto /usr/$(get_libdir)/${PN}/tools
+ doexe *.pl *.py *.conf *.sh
+ doexe tb2claws-mail update-po uudec uuooffice
+
+ # kill useless files
+ rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+ ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+ ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+ ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
new file mode 100644
index 0000000..c408680
--- /dev/null
+++ b/media-video/vcdimager/Manifest
@@ -0,0 +1,4 @@
+AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 SHA256 65798b9c6070d53957d46b0cac834e1ab9bd4014fab50773ac83b4d1babe00a6 SHA512 b49e8742627b6e0d56efd455230f78cb49a3337a376da39d9b77869835c1d34b8f4a826ae0f888fe0f81ce011a3f0e6dcf52479c34813594129fb2916c782c57 WHIRLPOOL 4310ce8d881f29f4185a9fc7aa6c8cd280bd4ecbc09a98f0517ba4c9b1b50d02a29481768f3cd40976482d7a30dc3c4b137b4d63415f930cbcb42ef3770ea352
+DIST vcdimager-0.7.24.tar.gz 1066815 SHA256 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214 WHIRLPOOL b94f3937415ec1b178484adfc653b1846e9f52ed95fd0677fa5f7b077b345f4cbd3b11526bb9b9011b76f74a916644e9d60dec3ce37571ed97523db04cb5ec42
+EBUILD vcdimager-0.7.24.ebuild 1469 SHA256 752485f477184fca70d9566332797ae9a631c0030d24f9e70db48ef81ffa750e SHA512 c354a833d0558bd0f057ec5667aee3ecb97890de50c2cc55db23b9ce1f98e5034c49c26d4ad50719c60132e4656721211f0810d54226972f89ecb7b40fba4e24 WHIRLPOOL 672f68af2a98acf5d45909f17e393027b14def6019e4b61f332b064985162e652a6ef3207c519bfbd9a09efe512728afc69a56925e0a9f68f8721a8ced5e8703
+MISC metadata.xml 223 SHA256 7d0451c70b262d8928fbd11c938e6b5663794345ad10f7be8533ab42b521e42c SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db WHIRLPOOL 0b20f52f85830d008257e03325b74780038fc6e0bf6cc3917aa7f0d8621673c87bebcf201ca0cd876276febe9fcf785fe8f80de1889f2009fdd5bd05c2615d17
diff --git a/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
new file mode 100644
index 0000000..477e400
--- /dev/null
+++ b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch
@@ -0,0 +1,230 @@
+diff --git a/frontends/xml/vcd_xml_rip.c b/frontends/xml/vcd_xml_rip.c
+index 3d28065..f1be95d 100644
+--- a/frontends/xml/vcd_xml_rip.c
++++ b/frontends/xml/vcd_xml_rip.c
+@@ -769,7 +769,7 @@ _visit_lot (pbc_ctx_t *p_pbc_ctx)
+ _visit_pbc (p_pbc_ctx, n + 1, tmp, true);
+
+ _vcd_list_sort (p_pbc_ctx->offset_list,
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
+ }
+
+ static int
+diff --git a/include/libvcd/info.h b/include/libvcd/info.h
+index 2d70940..b62d541 100644
+--- a/include/libvcd/info.h
++++ b/include/libvcd/info.h
+@@ -455,12 +455,12 @@ extern "C" {
+ /*!
+ Get the VCD info list.
+ */
+- CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
++ CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo);
+
+ /*!
+ Get the VCD info extended offset list.
+ */
+- CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
++ CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo);
+
+ /*!
+ Get the VCD info offset multiplier.
+diff --git a/lib/data_structures.c b/lib/data_structures.c
+index 4415ae1..cef7381 100644
+--- a/lib/data_structures.c
++++ b/lib/data_structures.c
+@@ -58,7 +58,7 @@ struct _CdioListNode
+ /* impl */
+
+ static bool
+-_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
++_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func)
+ {
+ CdioListNode_t **pp_node;
+ bool changed = false;
+@@ -86,7 +86,7 @@ _bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func)
+ return changed;
+ }
+
+-void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func)
++void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func)
+ {
+ /* fixme -- this is bubble sort -- worst sorting algo... */
+
+@@ -263,7 +263,7 @@ _vcd_tree_node_sort_children (VcdTreeNode_t *p_node,
+ vcd_assert (p_node != NULL);
+
+ if (p_node->children)
+- _vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func);
++ _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func);
+ }
+
+ void
+diff --git a/lib/data_structures.h b/lib/data_structures.h
+index d0932a9..eb5ba48 100644
+--- a/lib/data_structures.h
++++ b/lib/data_structures.h
+@@ -28,7 +28,7 @@
+
+ CdioListNode_t *_vcd_list_at (CdioList_t *list, int idx);
+
+-void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func);
++void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func);
+
+ /* n-way tree */
+
+diff --git a/lib/dict.h b/lib/dict.h
+index c3e2ce3..fa003f6 100644
+--- a/lib/dict.h
++++ b/lib/dict.h
+@@ -88,7 +88,7 @@ _dict_get_bykey (VcdObj_t *obj, const char key[])
+ vcd_assert (key != NULL);
+
+ node = _cdio_list_find (obj->buffer_dict_list,
+- (_cdio_list_iterfunc) _dict_key_cmp,
++ (_cdio_list_iterfunc_t) _dict_key_cmp,
+ (char *) key);
+
+ if (node)
+@@ -106,7 +106,7 @@ _dict_get_bysector (VcdObj_t *obj, uint32_t sector)
+ vcd_assert (sector != SECTOR_NIL);
+
+ node = _cdio_list_find (obj->buffer_dict_list,
+- (_cdio_list_iterfunc) _dict_sector_cmp,
++ (_cdio_list_iterfunc_t) _dict_sector_cmp,
+ §or);
+
+ if (node)
+diff --git a/lib/files.c b/lib/files.c
+index 79fa8fe..61e8077 100644
+--- a/lib/files.c
++++ b/lib/files.c
+@@ -634,7 +634,7 @@ get_search_dat_size (const VcdObj_t *p_vcdobj)
+ + (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t));
+ }
+
+-static CdioList *
++static CdioList_t *
+ _make_track_scantable (const VcdObj_t *p_vcdobj)
+ {
+ CdioList_t *p_all_aps = _cdio_list_new ();
+diff --git a/lib/image_bincue.c b/lib/image_bincue.c
+index 69091b3..4e4d460 100644
+--- a/lib/image_bincue.c
++++ b/lib/image_bincue.c
+@@ -88,7 +88,7 @@ _sink_free (void *user_data)
+ }
+
+ static int
+-_set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
++_set_cuesheet (void *user_data, const CdioList_t *vcd_cue_list)
+ {
+ _img_bincue_snk_t *_obj = user_data;
+ CdioListNode_t *node;
+@@ -102,7 +102,7 @@ _set_cuesheet (void *user_data, const CdioList *vcd_cue_list)
+
+ track_no = 0;
+ index_no = 0;
+- _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list)
++ _CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list)
+ {
+ const vcd_cue_t *_cue = _cdio_list_node_data (node);
+ char *psz_msf;
+diff --git a/lib/info_private.c b/lib/info_private.c
+index 648ef27..53edff7 100644
+--- a/lib/info_private.c
++++ b/lib/info_private.c
+@@ -136,7 +136,7 @@ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj)
+ ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true);
+
+ _vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list,
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp);
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp);
+
+ /* Now really complete the offset table with LIDs. This routine
+ might obviate the need for vcdinf_visit_pbc() or some of it which is
+diff --git a/lib/mpeg.h b/lib/mpeg.h
+index 0425db6..7df668a 100644
+--- a/lib/mpeg.h
++++ b/lib/mpeg.h
+@@ -103,7 +103,7 @@ typedef struct {
+ unsigned vbvsize;
+ bool constrained_flag;
+
+- CdioList *aps_list; /* filled up by vcd_mpeg_source */
++ CdioList_t *aps_list; /* filled up by vcd_mpeg_source */
+ double last_aps_pts; /* temp, see ->packet */
+
+ } shdr[3];
+diff --git a/lib/mpeg_stream.c b/lib/mpeg_stream.c
+index 8384780..2ee3f41 100644
+--- a/lib/mpeg_stream.c
++++ b/lib/mpeg_stream.c
+@@ -270,7 +270,7 @@ vcd_mpeg_source_scan (VcdMpegSource_t *obj, bool strict_aps, bool fix_scan_info,
+ }
+
+ static double
+-_approx_pts (CdioList *aps_list, uint32_t packet_no)
++_approx_pts (CdioList_t *aps_list, uint32_t packet_no)
+ {
+ double retval = 0;
+ CdioListNode_t *node;
+@@ -324,7 +324,7 @@ _set_scan_msf (msf_t *_msf, long lsn)
+
+ static void
+ _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr,
+- unsigned packet_no, double pts, CdioList *aps_list)
++ unsigned packet_no, double pts, CdioList_t *aps_list)
+ {
+ CdioListNode_t *node;
+ long _next = -1, _prev = -1, _forw = -1, _back = -1;
+diff --git a/lib/vcd.c b/lib/vcd.c
+index 4936c09..b1545a0 100644
+--- a/lib/vcd.c
++++ b/lib/vcd.c
+@@ -583,7 +583,7 @@ vcd_obj_add_sequence_pause (VcdObj_t *obj, const char sequence_id[],
+ }
+
+ _vcd_list_sort (p_sequence->pause_list,
+- (_cdio_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func_t) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -623,7 +623,7 @@ vcd_obj_add_segment_pause (VcdObj_t *p_obj, const char segment_id[],
+ }
+
+ _vcd_list_sort (_segment->pause_list,
+- (_cdio_list_cmp_func) _pause_cmp);
++ (_cdio_list_cmp_func_t) _pause_cmp);
+
+ vcd_debug ("added autopause point at %f", pause_time);
+
+@@ -685,7 +685,7 @@ vcd_obj_add_sequence_entry (VcdObj_t *p_obj, const char sequence_id[],
+ }
+
+ _vcd_list_sort (p_sequence->entry_list,
+- (_cdio_list_cmp_func) _entry_cmp);
++ (_cdio_list_cmp_func_t) _entry_cmp);
+
+ return 0;
+ }
+@@ -1001,7 +1001,7 @@ vcd_obj_add_dir (VcdObj_t *p_obj, const char iso_pathname[])
+ _cdio_list_append (p_obj->custom_dir_list, _iso_pathname);
+
+ _vcd_list_sort (p_obj->custom_dir_list,
+- (_cdio_list_cmp_func) strcmp);
++ (_cdio_list_cmp_func_t) strcmp);
+
+ return 0;
+ }
+@@ -2290,7 +2290,7 @@ vcd_obj_write_image (VcdObj_t *p_obj, VcdImageSink_t *p_image_sink,
+ /* start with meta info */
+
+ {
+- CdioList *p_cue_list;
++ CdioList_t *p_cue_list;
+ vcd_cue_t *p_cue;
+
+ p_cue_list = _cdio_list_new ();
diff --git a/media-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
new file mode 100644
index 0000000..8115853
--- /dev/null
+++ b/media-video/vcdimager/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ media-video@gentoo.org
+
+
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
new file mode 100644
index 0000000..0ae47dd
--- /dev/null
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="GNU VCDimager"
+HOMEPAGE="http://www.vcdimager.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+xml static-libs"
+
+RDEPEND="
+ >=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
+ dev-libs/popt
+ xml? ( dev-libs/libxml2:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+DOCS="AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO"
+
+src_prepare() {
+ # Avoid building useless programs. Bug #226249
+ sed -i \
+ -e 's/check_PROGRAMS =/check_PROGRAMS +=/' \
+ -e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
+ test/Makefile.in || die
+ sed -i \
+ -e 's/noinst_PROGRAMS =/check_PROGRAMS =/' \
+ example/Makefile.in || die
+
+ epatch "${FILESDIR}"/$P-libcdio-1.0.0.patch
+}
+
+multilib_src_configure() {
+ # We disable the xmltest because the configure script includes differently
+ # than the actual XML-frontend C files.
+ local myconf
+ if use xml && multilib_is_native_abi ; then
+ myconf="--with-xml-prefix=${EPREFIX}/usr --disable-xmltest"
+ else
+ myconf="--without-xml-frontend"
+ fi
+ multilib_is_native_abi || myconf="${myconf} --without-cli-frontend"
+ ECONF_SOURCE="${S}" \
+ econf $(use_enable static-libs static) ${myconf}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+ einstalldocs
+}