gentoo resync : 14.07.2018

63 files changed, 1264 insertions, 178 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 64e59f17b098..be874af8ea77 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/barry-0.18.3 b/app-pda/barry-0.18.3
deleted file mode 100644
index 7b6b1c63b167..000000000000
--- a/app-pda/barry-0.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.6 ) nls? ( >=sys-devel/gettext-0.18.1.1 ) >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Sync, backup, program management, and charging for BlackBerry devices
-EAPI=5
-HOMEPAGE=http://www.netdirect.ca/software/packages/barry/
-IUSE=boost doc gui nls static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-SA-3.0 GPL-2
-RDEPEND=>=dev-cpp/libxmlpp-2.6:2.6 dev-libs/glib:2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 ) gui? ( dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libglademm:2.4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/barry/barry-0.18.3.tar.bz2
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e685e5c3ab37849b5e9a74076f9a1db8
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
new file mode 100644
index 000000000000..a542daa322aa
--- /dev/null
+++ b/app-pda/barry/Manifest
@@ -0,0 +1,4 @@
+AUX barry-0.18.4-shared_ptr.patch 746 BLAKE2B c45dbda427c25807e1cdb9d3d54a5695a92623230eaaabe41cff71236715c816f1d2de6e8c29f71d993288803010803fe046a3a96e39d9f0b6da3a7f452d793c SHA512 b376e3553aa22d3aa8a04cee766d34aae3d03ad3677174d5f02118653fbfe8391175238727cf0c21c0caf33a850cc10fa0fcf077266815e891bf5efbb3d0d745
+DIST barry-0.18.3.tar.bz2 3457451 BLAKE2B ba7f49e95ac85d764c1275f6dc06f4a7be080d8d725466e1bb8d23977437879f2f7bf7581d9f5bc1262a07f8d1478992ce3c62c9893504f1094dcfb16d944ebd SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd
+EBUILD barry-0.18.3.ebuild 2328 BLAKE2B 6764afecfe7b135440d912a546c4b7b10bcbeadf6d070e45265ced4f5f73cff63270d8258af5f03e8f3171ec45b05630b2d2befb2477cf302ae893d47d528a30 SHA512 810f3bbafb86fe081b5bc05c1fdd078f9fb6cb463ca51e37f3f16c924c5612c8bb1e1b5c97e0ae6c2b44f05059667194db0a3d624ad0effb8b4dfb1486bd1819
+MISC metadata.xml 498 BLAKE2B 996a82041baa888af865b675d7cf737e43e7fee3ef884ccbbfde08381bbfedf66f7eba86f03f4599f4068f159fdd57cf8b938e723680053bb47ed581bbdfa58a SHA512 fb554a30934fdb3889ae42e1828f62ac3b45f97b1d38739d205a790c295e7081bdb78322e8896d79f4b7348bf295cd5ef0810a6de14a24ba3c32db00d25e42c0
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
new file mode 100644
index 000000000000..6a672094e52f
--- /dev/null
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit bash-completion-r1 eutils flag-o-matic gnome2-utils udev
+
+DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
+HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
+SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
+
+LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost doc gui nls static-libs"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
+	dev-libs/glib:2
+	>=dev-libs/libtar-1.2.11-r2
+	>=media-libs/libsdl-1.2
+	>=sys-fs/fuse-2.5:=
+	sys-libs/zlib
+	virtual/libusb:1
+	boost? ( >=dev-libs/boost-1.33 )
+	gui? (
+		dev-cpp/glibmm:2
+		dev-cpp/gtkmm:2.4
+		dev-cpp/libglademm:2.4
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.6 )
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
+
+	append-cxxflags -std=c++11
+
+	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
+	sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		$(use_enable boost) \
+		$(use_enable gui) \
+		--disable-desktop \
+		--disable-rpath
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${S}"
+		doxygen || die
+	fi
+}
+
+src_install() {
+	default
+
+	# docs
+	rm -rf "${S}"/doc/www/*.{php,sh}
+	find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} +
+	use doc && dohtml "${S}"/doc/www/doxygen/html/*
+	rm -rf "${S}"/doc/www
+	dodoc -r "${S}"/doc/*
+
+	# Skipping different (old Fedora) rules 69-blackberry.rules in purpose
+	udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules
+
+	# blacklist for BERRY_CHARGE kernel module
+	insinto /lib/modprobe.d
+	doins "${S}"/modprobe/blacklist-berry_charge.conf
+
+	# pppd options files
+	docinto ppp
+	dodoc "${S}"/ppp/*
+
+	dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
+
+	newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
+	use gui && domenu "${S}"/menu/barrybackup.desktop
+
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
new file mode 100644
index 000000000000..dbccfe66ea21
--- /dev/null
+++ b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
@@ -0,0 +1,25 @@
+With -std=c++-11 shared_ptr is available in the standard library so pulling in
+the std::tr1 namespace creates an ambiguous reference.  Simple fix is to stop
+doing that but isn't backwards compatible.  We don't care in Gentoo since we'll
+always be building barry with -std=c++11 due to libsigc++ abi compatibility.
+
+--- a/tools/bio.cc
++++ b/tools/bio.cc
+@@ -42,7 +42,6 @@
+ #include "i18n.h"
+ 
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+ 
+ // keeping a record of all the -i device / -o device pin numbers, so
+--- a/tools/btool.cc
++++ b/tools/btool.cc
+@@ -59,7 +59,6 @@
+ #include "barrygetopt.h"
+ 
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+ 
+ std::map<std::string, std::string> SortKeys;
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
new file mode 100644
index 000000000000..64b764c3d6cd
--- /dev/null
+++ b/app-pda/barry/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		Barry is a utility for synchronization, backup, restore,
+		program management, and charging of BlackBerry devices.
+	</longdescription>
+	<use>
+		<flag name="boost">Enable boost support</flag>
+		<flag name="gui">Install the GUI backup tool</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">barry</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-pda/dynamite-0.1.1_p20120512 b/app-pda/dynamite-0.1.1_p20120512
deleted file mode 100644
index 34b7ab3fd0f9..000000000000
--- a/app-pda/dynamite-0.1.1_p20120512
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A tool for decompressing data compressed with PKWARE Data Compression Library
-EAPI=4
-HOMEPAGE=https://github.com/twogood/dynamite https://sourceforge.net/projects/synce/
-IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ssuominen/dynamite-0.1.1_p20120512.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92d6befa9fd5ec7aa6507e2ceb52ef5c
diff --git a/app-pda/dynamite/Manifest b/app-pda/dynamite/Manifest
new file mode 100644
index 000000000000..7dac8b447b4c
--- /dev/null
+++ b/app-pda/dynamite/Manifest
@@ -0,0 +1,4 @@
+AUX dynamite-bootstrap.patch 311 BLAKE2B e750eeaaa0439df4c583929fdfb1c265456f1b7d9553c392320429a4db55444e40d531aa538bc26676dcfd1ffb07ece5134e386e21fb87f87d2b8368b1450f06 SHA512 2e8fd97c60ba5af32a477df33ab9caf574d0235a34d177669ba5d2f9d3c27659e77f1ff4362e46d58799a29b5d3cbb24c2c295d7b21319c4556172bba0d50e89
+DIST dynamite-0.1.1_p20120512.tar.xz 48964 BLAKE2B 48eea5a040e8acbbae87aa8779c034b0d9e34cd68997d6fdb79a4b0846e0778a2934d67ea59176a3e0b15d815100ff372bf6f5175345aaaedd37d4889ab6f02c SHA512 ba7a4c773d460e0e644cb1da3ae7fe3e48fc6fbe94dafc3ccab61659ade6363544a5d1d458574d365623b7eeaa1c1c7d10c05324a344d0e8ef7422276540daaa
+EBUILD dynamite-0.1.1_p20120512.ebuild 715 BLAKE2B 2dee9c64265f90395480f29284fbb5083b92414e3e997e7cec3663c800678cf142e7f726155fc8ab1f88f20352a65fac78576a04d2c984582daab750002a5167 SHA512 adadbe90da95d3389849b39bb3240c275686099abf9cc66a3fa85cf81acc554fed72684cc348f13654b54a0467a933b320d36891b83a6408f31603330cc97619
+MISC metadata.xml 276 BLAKE2B b0dc6f28cc3a36756443620c597112b36352e2e02b20d8767f0c6d6787f12bbe5daf78ca692939bfb29dc71e8bd77e926caa7ee34051a047f5786e8a991578f6 SHA512 b46fb29439f50629567cacfdb6e711d0956da189500a5518ccdc0e28ac98a78ae6f2652599ec19407df567c98343cb94f1c3bc46808744f11c4bde7c2457fcbf
diff --git a/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
new file mode 100644
index 000000000000..2586a3d99648
--- /dev/null
+++ b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A tool for decompressing data compressed with PKWARE Data Compression Library"
+HOMEPAGE="https://github.com/twogood/dynamite https://sourceforge.net/projects/synce/"
+SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-bootstrap.patch
+	./bootstrap
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-pda/dynamite/files/dynamite-bootstrap.patch b/app-pda/dynamite/files/dynamite-bootstrap.patch
new file mode 100644
index 000000000000..3ac2695f89b4
--- /dev/null
+++ b/app-pda/dynamite/files/dynamite-bootstrap.patch
@@ -0,0 +1,16 @@
+--- bootstrap
++++ bootstrap
+@@ -26,8 +26,8 @@
+ 	INCLUDES="-I m4"
+ fi
+ set -x
+-aclocal $INCLUDES
+-autoheader
+-libtoolize --copy --automake
+-automake --copy --foreign --add-missing
+-autoconf
++# aclocal $INCLUDES
++# autoheader
++# libtoolize --copy --automake
++# automake --copy --foreign --add-missing
++# autoconf
diff --git a/app-pda/dynamite/metadata.xml b/app-pda/dynamite/metadata.xml
new file mode 100644
index 000000000000..9239ff1832ab
--- /dev/null
+++ b/app-pda/dynamite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">twogood/dynamite</remote-id>
+    <remote-id type="sourceforge">synce</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-pda/gnupod-0.99.8-r1 b/app-pda/gnupod-0.99.8-r1
deleted file mode 100644
index 2384bef3b0f7..000000000000
--- a/app-pda/gnupod-0.99.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( virtual/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A collection of Perl-scripts for iPod
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gnupod/
-IUSE=aac ffmpeg flac mp3 ogg
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-3
-RDEPEND=dev-perl/TimeDate dev-perl/XML-Parser >=dev-perl/MP3-Info-1.01 dev-perl/Unicode-String dev-perl/Digest-SHA1 dev-perl/libwww-perl ffmpeg? ( virtual/ffmpeg ) flac? ( dev-perl/Audio-FLAC-Header media-libs/flac aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) ogg? ( dev-perl/Ogg-Vorbis-Header-PurePerl media-sound/vorbis-tools aac? ( >=media-libs/faac-1.24 ) mp3? ( media-sound/lame ) !aac? ( media-sound/lame ) ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://blinkenlights.ch/gnupod-dist/stable/gnupod-0.99.8.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7c232f61364d84a9e4b555c27ca88d0
diff --git a/app-pda/gnupod/Manifest b/app-pda/gnupod/Manifest
new file mode 100644
index 000000000000..20eb63b66780
--- /dev/null
+++ b/app-pda/gnupod/Manifest
@@ -0,0 +1,3 @@
+DIST gnupod-0.99.8.tgz 207572 BLAKE2B a3f87ed0f3d66d83fb3aec5ebee3d490f01488e51627b57956c27fba7bac89c37cd2c38ec15d11f354f3af6eb2f72e73b918540737cc5d5723c32a001a0b765e SHA512 ac9ceadff371e052b6deb4067aa73e190ad109feb3337cc205d521fbab11b5bc1415e44907761711eeaaf7fcea6a1a841c08e2177fa912446cfe7495d2a5182b
+EBUILD gnupod-0.99.8-r1.ebuild 1222 BLAKE2B 4f2f0133b68ae635645cf77aa95f4da7bb6011b620612ea457b39407e9745634d5113c961ef9fb081134eb0810271778e68f6a2feae7b2e9e86b9235fb4e790e SHA512 7d935cada449a572eca274b55e6da8f84966bba01e73120129f23725b8b5da376a76f507dbce9ef502be0a0e80f8deec82ebfa9e80760902a1011e54c4b98126
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/gnupod/gnupod-0.99.8-r1.ebuild b/app-pda/gnupod/gnupod-0.99.8-r1.ebuild
new file mode 100644
index 000000000000..a9984189905e
--- /dev/null
+++ b/app-pda/gnupod/gnupod-0.99.8-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="A collection of Perl-scripts for iPod"
+HOMEPAGE="https://www.gnu.org/software/gnupod/"
+SRC_URI="http://blinkenlights.ch/gnupod-dist/stable/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="aac ffmpeg flac mp3 ogg"
+
+RDEPEND="dev-perl/TimeDate
+	dev-perl/XML-Parser
+	>=dev-perl/MP3-Info-1.01
+	dev-perl/Unicode-String
+	dev-perl/Digest-SHA1
+	dev-perl/libwww-perl
+	ffmpeg?	( virtual/ffmpeg )
+	flac?	( dev-perl/Audio-FLAC-Header
+			  media-libs/flac
+			  aac?  ( >=media-libs/faac-1.24 )
+			  mp3?  ( media-sound/lame )
+			  !aac? ( media-sound/lame ) )
+	ogg?	( dev-perl/Ogg-Vorbis-Header-PurePerl
+			  media-sound/vorbis-tools
+			  aac?  ( >=media-libs/faac-1.24 )
+			  mp3?  ( media-sound/lame )
+			  !aac? ( media-sound/lame ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	perl_set_version
+	sed -i -e "s:\$INC\[0\]/\$modi:${VENDOR_ARCH}/\$modi:g" \
+		tools/gnupod_install.pl || die
+
+	emake DESTDIR="${D}" install
+
+	dodoc CHANGES README* doc/gnupodrc.example doc/gnutunesdb.example
+	dohtml doc/gnupod.html
+}
diff --git a/app-pda/gnupod/metadata.xml b/app-pda/gnupod/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/gnupod/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/gtkpod-2.1.5 b/app-pda/gtkpod-2.1.5
deleted file mode 100644
index f3c27e55b522..000000000000
--- a/app-pda/gtkpod-2.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2.7.7:2 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.8.2:= >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( >=media-libs/clutter-gtk-1.2:1.0 ) curl? ( >=net-misc/curl-7.10 ) flac? ( media-libs/flac ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 cdr? ( >=app-cdr/brasero-3 >=media-libs/libdiscid-0.2.2 media-libs/musicbrainz:5 ) ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) dev-util/intltool sys-devel/flex sys-devel/gettext virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical user interface to the Apple productline
-EAPI=5
-HOMEPAGE=http://www.gtkpod.org/
-IUSE=aac clutter curl cdr flac gstreamer mp3 vorbis
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2.7.7:2 >=dev-util/anjuta-3.6 >=media-libs/libgpod-0.8.2:= >=media-libs/libid3tag-0.15 >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( >=media-libs/clutter-gtk-1.2:1.0 ) curl? ( >=net-misc/curl-7.10 ) flac? ( media-libs/flac ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 cdr? ( >=app-cdr/brasero-3 >=media-libs/libdiscid-0.2.2 media-libs/musicbrainz:5 ) ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-REQUIRED_USE=cdr? ( gstreamer )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkpod/gtkpod-2.1.5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d875a64a537dcc0ea61e0bcbeaa5d38f
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
new file mode 100644
index 000000000000..ab7aa9dc72d0
--- /dev/null
+++ b/app-pda/gtkpod/Manifest
@@ -0,0 +1,5 @@
+AUX gtkpod-2.1.3-gold.patch 451 BLAKE2B 2f0202782394abc636265fbf9d13dade3d28608bec3bc8298ae1ea592a4f34688ba4be227aead6c4cfa8a946dbe872dbb5d596fd728e18e27166a01b524e6c00 SHA512 b6fb32ce37087beed99c475f747a6c79541821d836892ab4b8673ec49ca0a72ca6d55aaeaf8cf25895cc8e4f54341673e0f5616c5fa5ebc610250c641f4a2b13
+AUX gtkpod-2.1.5-m4a.patch 405 BLAKE2B 0102cecc598c7594dc545f9142fb152e601db8a793b80acb4ce92a7594bb6902cfb19f90612a169585c42daa6827046f257cab76db7be69534b0e7c79f14d75a SHA512 d7774f82d5a30c393354da9302f4cd62eb2c9c0588bb6afcc1429850730f727db91bd200c78934e9a3a64a112a11a51d62d7bfb3a17f74c77e259ebb126037a4
+DIST gtkpod-2.1.5.tar.gz 3780232 BLAKE2B 8de431ed04b1f9d85322d7d1c823f7ace08511616f81a3030dbebe455f71e7f130944173c1fde6e27aceec2cd71a7f731fa00ea574ef201bf48ef6100f3bf82c SHA512 428b9ce75d2c7c208a847bee6f10f6ed0c9f896efbedd86ed41ecce64fdbf1b937968042ad9945aec33a714fc3031427a54f924619db99cc111945355978f24c
+EBUILD gtkpod-2.1.5.ebuild 2240 BLAKE2B 52ac88288ad8a45d366a1ca305691405155aa3670a6458d63d88ac461dc9d46965959bf317ea863b723f4bcaaedafde143b0fb9e18e88f45e582650d8aa081d7 SHA512 5619e8def4900659558842cecbd8017cbf21d1c0d402ce116e5350915fcd17f189cc4aefa7e80df0185998138cd21eb230746d37cf25ff2fa7ba09782e5f3eca
+MISC metadata.xml 335 BLAKE2B eb5370d6ed11cddddb74642e42a2bbb70d74d7e45b1dc228be2febc3cd3a1e6d0344e96bc94a3417b0c6c6cd67e5658fc8b06a53106ad746db92f48f70d47d31 SHA512 97aa0c82eebf5b63b8f3de0ea32f3f51eed2ebb2ba37a90a60759ffd7caf20ce90235851cdbf05fb5d45e3a0d35e1c062fb92e10cf10285c42e5ff20657ff061
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch b/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch
new file mode 100644
index 000000000000..93c9f72a3747
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.3-gold.patch
@@ -0,0 +1,15 @@
+ libgtkpod/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
+index 464741f..c69dac8 100644
+--- a/libgtkpod/Makefile.am
++++ b/libgtkpod/Makefile.am
+@@ -50,6 +50,7 @@ AM_CFLAGS = \
+ libgtkpod_la_LDFLAGS = $(LIBGTKPOD_LDFLAGS) -version-info $(LIBGTKPOD_SO_VERSION) -no-undefined
+ libgtkpod_la_LIBADD = \
+ 	$(LIBGTKPOD_LIBS) \
++	-lm \
+ 	@LIBOBJS@
+ 	
+ libgtkpodincludebase = $(includedir)/gtkpod
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.5-m4a.patch b/app-pda/gtkpod/files/gtkpod-2.1.5-m4a.patch
new file mode 100644
index 000000000000..1b286803f4b5
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.5-m4a.patch
@@ -0,0 +1,11 @@
+--- gtkpod-2.1.5/configure.ac.orig	2016-01-29 00:40:08.559840172 +0000
++++ gtkpod-2.1.5/configure.ac	2016-01-29 00:51:53.901127707 +0000
+@@ -341,7 +341,7 @@ fi
+ dnl Set up variables for M4A plugin
+ dnl -------------------------------------------------------------
+ 
+-if test "x$have_mp4" = "xyes" -a "x$have_faad" = "xyes"; then
++if test "x$have_mp4" = "xyes"; then
+ 	have_m4a="yes"
+ else
+ 	have_m4a="no"
diff --git a/app-pda/gtkpod/gtkpod-2.1.5.ebuild b/app-pda/gtkpod/gtkpod-2.1.5.ebuild
new file mode 100644
index 000000000000..3e412ebd2564
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A graphical user interface to the Apple productline"
+HOMEPAGE="http://www.gtkpod.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
+REQUIRED_USE="cdr? ( gstreamer )"
+
+COMMON_DEPEND="
+	>=dev-libs/gdl-3.6:3
+	>=dev-libs/glib-2.31:2
+	>=dev-libs/libxml2-2.7.7:2
+	>=dev-util/anjuta-3.6
+	>=media-libs/libgpod-0.8.2:=
+	>=media-libs/libid3tag-0.15
+	>=x11-libs/gtk+-3.0.8:3
+	aac? ( media-libs/faad2 )
+	clutter? ( >=media-libs/clutter-gtk-1.2:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	flac? ( media-libs/flac )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		cdr? (
+			>=app-cdr/brasero-3
+			>=media-libs/libdiscid-0.2.2
+			media-libs/musicbrainz:5
+			)
+		)
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-sound/vorbis-tools
+		)
+"
+
+# to pull in at least -flac and -vorbis plugins , but others at the same time
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.1.3-gold.patch
+	epatch "${FILESDIR}"/${PN}-2.1.5-m4a.patch
+
+	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #420279
+	addpredict /dev
+
+	gnome2_src_configure \
+		--enable-deprecations \
+		--disable-static \
+		--disable-plugin-coverweb \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_enable cdr plugin-sjcd) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac mp4)
+}
+
+src_install() {
+	gnome2_src_install \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+	rm -f "${ED}"/usr/share/gtkpod/data/{AUTHORS,COPYING} || die
+}
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
new file mode 100644
index 000000000000..94faaf79ac49
--- /dev/null
+++ b/app-pda/gtkpod/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-needed -->
+	<use>
+		<flag name="clutter">Enable clutter support for displaying coverart</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gtkpod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-pda/ideviceinstaller-1.0.1 b/app-pda/ideviceinstaller-1.0.1
deleted file mode 100644
index ed46b4af7d9c..000000000000
--- a/app-pda/ideviceinstaller-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=dev-libs/libzip-0.8 virtual/pkgconfig
-DESCRIPTION=A tool to interact with the installation_proxy of an Apple's iDevice
-EAPI=5
-HOMEPAGE=http://www.libimobiledevice.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=dev-libs/libzip-0.8
-SLOT=0
-SRC_URI=http://www.libimobiledevice.org/downloads/ideviceinstaller-1.0.1.tar.bz2
-_md5_=c677bb903a8c34c86ae94995803b843c
diff --git a/app-pda/ideviceinstaller-1.1.0 b/app-pda/ideviceinstaller-1.1.0
deleted file mode 100644
index c76a4615a0c5..000000000000
--- a/app-pda/ideviceinstaller-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=dev-libs/libzip-0.8 virtual/pkgconfig
-DESCRIPTION=A tool to interact with the installation_proxy of an Apple's iDevice
-EAPI=5
-HOMEPAGE=http://www.libimobiledevice.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=dev-libs/libzip-0.8
-SLOT=0
-SRC_URI=http://www.libimobiledevice.org/downloads/ideviceinstaller-1.1.0.tar.bz2
-_md5_=4ccbd7415a777df1232ac65f29df116c
diff --git a/app-pda/ideviceinstaller/Manifest b/app-pda/ideviceinstaller/Manifest
new file mode 100644
index 000000000000..31a469373e29
--- /dev/null
+++ b/app-pda/ideviceinstaller/Manifest
@@ -0,0 +1,5 @@
+DIST ideviceinstaller-1.0.1.tar.bz2 259871 BLAKE2B 04eb263869824035e5e1fb48aa8b000fd9534bb4b53582cf3e838e85c9a0743ae004bb78a426e46505315fa9c6b88766f100e2586c1f016603224614886723f1 SHA512 dcdd8c076ef6392122fe0154467b42e244728050d955a27eaf80b637729fb14c06e2d05a3d027f9dd3878758045f1112d1eb20f3bbcc86a7289e7eae26c90d19
+DIST ideviceinstaller-1.1.0.tar.bz2 272210 BLAKE2B da67c16d046e148d11bafcd1f33a8e5a5cba49c6f975ba038602eaf2444a76883d568e16583923c7303cce170e6718fc1cfcd0b2cffed5a1eaf895944043d785 SHA512 8bf5dc30b8fa2f0c171ec3705db8d8d143d2520b2875fc05d9d325bd4f1ffdf29230557e57f3e824654ab3bb71bbaf9019aa573d4b1cce29a9c75bf15024d623
+EBUILD ideviceinstaller-1.0.1.ebuild 589 BLAKE2B 805df31c42a129a0d92ef4f4a227b2b59de2639503e0dbd18f94b18c42a2635c7bfbade46413d789660d0e8eed50c446d3f9efa30df92c62f7a664e9b9e523b7 SHA512 676a7dde6cfbdf65984aeb4e0b9166d38e4d3ee76cfa90e6f71b89de2a8e511d8272febe153f18cc7b5fd266e079d6f2b4cce50bdeb4eb8c8ce65b6264eb331c
+EBUILD ideviceinstaller-1.1.0.ebuild 593 BLAKE2B b0f7790a95c2b9f5e97d5f5c8eb92e4f1d4dcac8f7278c189ec206c55870f526cac3ffa30d02c897016b9dfdf08df6efcc398adb73a42200f9f71fab71f4f3e8 SHA512 88a718fd228bc5adda906093a497bfc980496204366d9fcbcade57653b49c6fcdbc1b9e415dfde4618cca067945cf43ba98604be02c4014aa91d8cb5eb2c4a34
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/ideviceinstaller/ideviceinstaller-1.0.1.ebuild b/app-pda/ideviceinstaller/ideviceinstaller-1.0.1.ebuild
new file mode 100644
index 000000000000..cf9c5327a4cf
--- /dev/null
+++ b/app-pda/ideviceinstaller/ideviceinstaller-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool to interact with the installation_proxy of an Apple's iDevice"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
+	>=app-pda/libplist-1.8:=
+	>=dev-libs/libzip-0.8"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README"
+
+src_prepare() {
+	sed -i -e 's:-Werror -g::' configure || die
+}
diff --git a/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild b/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild
new file mode 100644
index 000000000000..24d059ef7ba3
--- /dev/null
+++ b/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool to interact with the installation_proxy of an Apple's iDevice"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
+	>=app-pda/libplist-1.8:=
+	>=dev-libs/libzip-0.8"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	sed -i -e 's:-Werror -g::' configure || die
+}
diff --git a/app-pda/ideviceinstaller/metadata.xml b/app-pda/ideviceinstaller/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/ideviceinstaller/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/ifuse-1.1.3 b/app-pda/ifuse-1.1.3
deleted file mode 100644
index 64eb6c2e2af3..000000000000
--- a/app-pda/ifuse-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=sys-fs/fuse-2.7.0:= virtual/pkgconfig
-DESCRIPTION=Mount Apple iPhone/iPod Touch file systems for backup purposes
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=sys-fs/fuse-2.7.0:=
-SLOT=0
-SRC_URI=http://www.libimobiledevice.org/downloads/ifuse-1.1.3.tar.bz2
-_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
-_md5_=9138fa9ead67672a9ad94edfb1b6222e
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
new file mode 100644
index 000000000000..ef3df5c5db70
--- /dev/null
+++ b/app-pda/ifuse/Manifest
@@ -0,0 +1,3 @@
+DIST ifuse-1.1.3.tar.bz2 90803 BLAKE2B fd47f2e73d11e8f7c26f5684f4287ba51a8c65b0d6e0ff058bdd0290810ab9de671a2a61a089713e7560506f607d47692d882c7e49d8d3d154f9cf7940e5e153 SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c
+EBUILD ifuse-1.1.3.ebuild 904 BLAKE2B 9d491fc0aac6d50d38070ea9c2855eb4a286f7f4cd49fbe9b5aca33d28f2d1efa3ccd56e238535b58ded755593d994e4b59c360a05844710836465ef1fc8985a SHA512 fe230a0102002efbc9ce3a0821d8630c3719bd0071fdf32fffdea16f5f7f3fb4bda79e83faaf2c29a9a689a619043492eba4b7c417099077dc8234731a7c4dd0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/ifuse/ifuse-1.1.3.ebuild b/app-pda/ifuse/ifuse-1.1.3.ebuild
new file mode 100644
index 000000000000..9d0c2f66960c
--- /dev/null
+++ b/app-pda/ifuse/ifuse-1.1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
+	>=app-pda/libplist-1.8:=
+	>=sys-fs/fuse-2.7.0:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOC_CONTENTS="Only use this filesystem driver to create backups of your data.
+The music database is hashed, and attempting to add files will cause the
+iPod/iPhone to consider your database unauthorised.
+It will respond by wiping all media files, requiring a restore through iTunes."
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/ifuse/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/iripdb-0.1.3b b/app-pda/iripdb-0.1.3b
deleted file mode 100644
index df5c92fa8806..000000000000
--- a/app-pda/iripdb-0.1.3b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/taglib sys-libs/zlib app-arch/unzip
-DESCRIPTION=Allows generating the DB files necessary for the iRiver iHP-1xx
-EAPI=6
-HOMEPAGE=http://www.fataltourist.com/iripdb/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/taglib sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.fataltourist.com/iripdb/iRipDB-0.1.3b.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=840c83e49ddb64f7ad60570a0a98aace
diff --git a/app-pda/iripdb/Manifest b/app-pda/iripdb/Manifest
new file mode 100644
index 000000000000..5b9e49c59c6a
--- /dev/null
+++ b/app-pda/iripdb/Manifest
@@ -0,0 +1,3 @@
+DIST iRipDB-0.1.3b.zip 32000 BLAKE2B 139affccb8545756c0d0e2652b7b1851b588aad3fcbcad04a88ccb517bcb10bd7aa4d46bc87885a6b32b0d27564bb98cde2bf21846140eb572f9c1953dba4d8a SHA512 7d3811e12a8570a07d2381bf6e97c9818b0da5b38dca95fc66441635343d827395d16fcdc7cea49179c062888ecbd88722f379ed59664919e10050618e66e8d5
+EBUILD iripdb-0.1.3b.ebuild 892 BLAKE2B 80c4dabb4da82e6f3f3f9fd6061b4307ed2024c4ddf235df28c4f87b5fa29f251c0d2c9ec7af7ee53b4ada6890e58c15f03d600b992779667c4bc1eb8a72c685 SHA512 c671f4b4c66841f38605147a82c980b467df3267ea2f298a8200eb4ba68edc1878e69a74dfdc7a88d351a6e8d7cea9246b19365fc471298bfdc56d419a4e9097
+MISC metadata.xml 579 BLAKE2B 264497ce16f001b7fb8c86880829d553ca82bdea0e6f6d41910b850369471dac9b41c9d8e937ff5abe278f1e1758d2541e0814db8937da195ebddb837ac3efa6 SHA512 b3c40a10ecbb9a7d700b37172c9ce5917554a89a5e3d0c88f1b7032f08b7187f0cb09bcb91288330715d3d4f19078ec639e3e56ac1f33c334ec16dc59a59e011
diff --git a/app-pda/iripdb/iripdb-0.1.3b.ebuild b/app-pda/iripdb/iripdb-0.1.3b.ebuild
new file mode 100644
index 000000000000..959d4997dc63
--- /dev/null
+++ b/app-pda/iripdb/iripdb-0.1.3b.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+MY_P="${P/iripdb/iRipDB}"
+
+DESCRIPTION="Allows generating the DB files necessary for the iRiver iHP-1xx"
+HOMEPAGE="http://www.fataltourist.com/iripdb/"
+SRC_URI="http://www.fataltourist.com/iripdb/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/taglib
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	echo "$(tc-getCXX) ${CXXFLAGS} -c -o main.o main.cpp"
+	$(tc-getCXX) ${CXXFLAGS} -c -o main.o -I/usr/include/taglib main.cpp
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o iripdb main.o -lz -lm -ltag -lstdc++"
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o iripdb main.o -lz -lm -ltag -lstdc++
+}
+
+src_install() {
+	dobin iripdb
+	dodoc AUTHORS README doc/iRivDB_structure
+}
diff --git a/app-pda/iripdb/metadata.xml b/app-pda/iripdb/metadata.xml
new file mode 100644
index 000000000000..039a8621d5cc
--- /dev/null
+++ b/app-pda/iripdb/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		iRipDB allows generating the DB files necessary for the iRiver iHP-1xx
+		series of MP3/Ogg HD Player on Linux and Windows. That will allow you
+		to navigate your files through the artist/album/genre menus. It supports
+		adding MP3 and Ogg files at this point. It's released under the GNU's
+		General Public License and, at this moment only in source code form.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-pda/jpilot-1.8.2 b/app-pda/jpilot-1.8.2
deleted file mode 100644
index 452a5054b5c9..000000000000
--- a/app-pda/jpilot-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-pda/pilot-link dev-libs/libgcrypt:0= x11-libs/gtk+:2 nls? ( dev-util/intltool sys-devel/gettext ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Desktop Organizer Software for the Palm Pilot
-EAPI=6
-HOMEPAGE=http://www.jpilot.org/
-IUSE=nls
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=app-pda/pilot-link dev-libs/libgcrypt:0= x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://jpilot.org/tarballs/jpilot-1.8.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1dd289ab36ddee892416c2a3c31e62d7
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
new file mode 100644
index 000000000000..8a6077debeef
--- /dev/null
+++ b/app-pda/jpilot/Manifest
@@ -0,0 +1,5 @@
+AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
+AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
+DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
+EBUILD jpilot-1.8.2.ebuild 894 BLAKE2B 35741144208a8384ae7e53e97209996ed09736f80e8466abbb0f7141135b6429219b7ad4fa9cb6c3c37783f318fbe1ae152a364335a1d3f2fe7b329a31e6b975 SHA512 c6af70006a1fe3a4a595e30e08c46946b632abd912355aa7fab91711cb4765cf63392edd28e941a87cf7e5354866037b73d496b545365ec7309be0f2cdcdc3b0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch b/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch
new file mode 100644
index 000000000000..e378d5699d00
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch
@@ -0,0 +1,119 @@
+* Modify Makefile.am's to be compliant with GNU and Gentoo filesystem conventions
+* Use redefinable variables instead of hard-replacing @VAR@-style variables
+* Replace abuse of 'libdir' install path variables
+
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -3,19 +3,17 @@
+ man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1 jpilot-merge.1
+ 
+ # Install the standard GNU doc files
+-miscdir = $(datadir)/doc/$(PACKAGE)
++miscdir = $(docdir)
+ misc_DATA = \
+ 	../BUGS \
+ 	../ChangeLog \
+-	../COPYING \
+ 	../AUTHORS \
+-	../INSTALL \
+ 	../README \
+ 	../TODO
+ 
+ # Install the manual docs
+-docdir = $(miscdir)/manual
+-doc_DATA = \
++manualdir = $(htmldir)
++manual_DATA = \
+ 	manual.html \
+ 	plugin.html \
+ 	jpilot-address.png \
+--- a/Expense/Makefile.am
++++ b/Expense/Makefile.am
+@@ -1,11 +1,11 @@
+-libdir = @libdir@/@PACKAGE@/plugins
++pluginsdir = $(libdir)/$(PACKAGE)/plugins
+ 
+ if MAKE_EXPENSE
+ 
+-lib_LTLIBRARIES = libexpense.la
++plugins_LTLIBRARIES = libexpense.la
+ libexpense_la_SOURCES = expense.c
+-libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
++libexpense_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
+ libexpense_la_LDFLAGS = -module -avoid-version
+-libexpense_la_LIBADD = @GTK_LIBS@
++libexpense_la_LIBADD = $(GTK_LIBS)
+ 
+ endif
+--- a/icons/Makefile.am
++++ b/icons/Makefile.am
+@@ -1,4 +1,4 @@
+-icondir = $(datadir)/doc/$(PACKAGE)/icons
++icondir = $(docdir)/icons
+ icon_DATA = \
+ 	jpilot-icon1.xpm \
+ 	jpilot-icon2.xpm \
+--- a/KeyRing/Makefile.am
++++ b/KeyRing/Makefile.am
+@@ -1,13 +1,13 @@
+-libdir = @libdir@/@PACKAGE@/plugins
++pluginsdir = $(libdir)/$(PACKAGE)/plugins
+ 
+ EXTRA_DIST = README
+ 
+ if MAKE_KEYRING
+ 
+-lib_LTLIBRARIES = libkeyring.la
++plugins_LTLIBRARIES = libkeyring.la
+ libkeyring_la_SOURCES = keyring.c
+-libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir)
++libkeyring_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) $(LIBGCRYPT_CFLAGS) -I$(top_srcdir)
+ libkeyring_la_LDFLAGS = -module -avoid-version
+-libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@
++libkeyring_la_LIBADD = $(OPENSSL_LIBS) $(GTK_LIBS) $(LIBGCRYPT_LIBS)
+ 
+ endif
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -161,18 +161,17 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ # Add i18n support
+-localedir = $(datadir)/locale
+ I18NDEFS = -DLOCALEDIR=\"$(localedir)\"
+ 
+-AM_CFLAGS= @PILOT_FLAGS@ @GTK_CFLAGS@ ${I18NDEFS}
++AM_CFLAGS= $(PILOT_FLAGS) $(GTK_CFLAGS) $(I18NDEFS)
+ 
+ # Add linkflags
+ jpilot_LDFLAGS = -export-dynamic
+-jpilot_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
+-jpilot_dump_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
++jpilot_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
++jpilot_dump_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
+ jpilot_sync_LDFLAGS = -export-dynamic
+-jpilot_sync_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
+-jpilot_merge_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@
++jpilot_sync_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
++jpilot_merge_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS)
+ 
+ ################################################################################
+ ## The rest of the file is copied over to the Makefile with only variable
+--- a/SyncTime/Makefile.am
++++ b/SyncTime/Makefile.am
+@@ -1,11 +1,11 @@
+-libdir = @libdir@/@PACKAGE@/plugins
++pluginsdir = $(libdir)/$(PACKAGE)/plugins
+ 
+ if MAKE_SYNCTIME
+ 
+-lib_LTLIBRARIES = libsynctime.la
++plugins_LTLIBRARIES = libsynctime.la
+ libsynctime_la_SOURCES = synctime.c
+-libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir)
++libsynctime_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir)
+ libsynctime_la_LDFLAGS = -module -avoid-version
+-libsynctime_la_LIBADD = @GTK_LIBS@
++libsynctime_la_LIBADD = $(GTK_LIBS)
+ 
+ endif
diff --git a/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch b/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch
new file mode 100644
index 000000000000..c4624e1e94e8
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch
@@ -0,0 +1,13 @@
+* The 'Icon=' property should not have a suffix
+
+--- a/jpilot.desktop
++++ b/jpilot.desktop
+@@ -2,7 +2,7 @@
+ Name=J-Pilot
+ Comment=Desktop organizer application for the Palm Pilot
+ Exec=jpilot
+-Icon=jpilot.xpm
++Icon=jpilot
+ Terminal=false
+ Type=Application
+ Categories=Office;PDA;
diff --git a/app-pda/jpilot/jpilot-1.8.2.ebuild b/app-pda/jpilot/jpilot-1.8.2.ebuild
new file mode 100644
index 000000000000..7d10a5cc6419
--- /dev/null
+++ b/app-pda/jpilot/jpilot-1.8.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
+HOMEPAGE="http://www.jpilot.org/"
+SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 x86"
+IUSE="nls"
+
+RDEPEND="
+	app-pda/pilot-link
+	dev-libs/libgcrypt:0=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch
+	"${FILESDIR}"/${PN}-1.8.2-fix-paths.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/icons
+
+	# .la files for plugins are useless
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/jpilot/metadata.xml b/app-pda/jpilot/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/jpilot/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/libimobiledevice-1.2.0-r1 b/app-pda/libimobiledevice-1.2.0-r1
deleted file mode 100644
index 9a7cfad766d7..000000000000
--- a/app-pda/libimobiledevice-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=gnutls libressl python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= >=app-pda/libusbmuxd-1.0.9:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-pda/libplist[python(-),python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0/6
-SRC_URI=http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2 https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> libimobiledevice-1.2.0-git.patch
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=afe8ef39159d9a5cd3be51dfc36fbc13
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
new file mode 100644
index 000000000000..c7906cb6d725
--- /dev/null
+++ b/app-pda/libimobiledevice/Manifest
@@ -0,0 +1,7 @@
+AUX gnutls-3.4.patch 2415 BLAKE2B cdd9f3ad241a866db1794ec2ac661df902b180555102173706a47700889ff98a18bdadefba90818edea14def51664c3bbe75fe38cf1375574f3fe7ba51c10340 SHA512 d1a46062d3e4a37dfbb8d8ac754f7e927e0f8f2720152d7f8604667b65ea8fa5f26777f4490cb01c7dc01771a96c545bc1b1c8b433482ad24fb9840f063fb36b
+DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
+DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
+DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
+DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
+EBUILD libimobiledevice-1.2.0-r1.ebuild 3257 BLAKE2B 184f9dedfd8b29fad918269ed2977d3ace20fecac526ee01d1b4234965a803c27ad7e352d2886730ab1df5bf47d3f19b4749f9e1c18a4341487472b3a60511d2 SHA512 ed720ee197c6a28ac904c7387f6ac018435ee4e3fb1c7dec469f81a17252e239cbd8ab8da17f2bf6db5b45d0a43eaa0c6df8dd55550deb856df669a0cd5bd4e8
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/files/gnutls-3.4.patch b/app-pda/libimobiledevice/files/gnutls-3.4.patch
new file mode 100644
index 000000000000..9b4b83372109
--- /dev/null
+++ b/app-pda/libimobiledevice/files/gnutls-3.4.patch
@@ -0,0 +1,51 @@
+From 2a5868411c57e25802d2f16fd6b77601f10d0b72 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@redhat.com>
+Date: Fri, 29 Apr 2016 22:58:34 +0200
+Subject: [PATCH] Updated gnutls certificate callback to new API (backwards
+ compatible)
+
+---
+ src/idevice.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index 5912aeb..f2de6a3 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -642,7 +642,11 @@ static const char *ssl_error_to_string(int e)
+ /**
+  * Internally used gnutls callback function that gets called during handshake.
+  */
++#if GNUTLS_VERSION_NUMBER >= 0x020b07
++static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr2_st * st)
++#else
+ static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t * req_ca_rdn, int nreqs, const gnutls_pk_algorithm_t * sign_algos, int sign_algos_length, gnutls_retr_st * st)
++#endif
+ {
+ 	int res = -1;
+ 	gnutls_certificate_type_t type = gnutls_certificate_type_get(session);
+@@ -650,7 +654,12 @@ static int internal_cert_callback(gnutls_session_t session, const gnutls_datum_t
+ 		ssl_data_t ssl_data = (ssl_data_t)gnutls_session_get_ptr(session);
+ 		if (ssl_data && ssl_data->host_privkey && ssl_data->host_cert) {
+ 			debug_info("Passing certificate");
++#if GNUTLS_VERSION_NUMBER >= 0x020b07
++			st->cert_type = type;
++			st->key_type = GNUTLS_PRIVKEY_X509;
++#else
+ 			st->type = type;
++#endif
+ 			st->ncerts = 1;
+ 			st->cert.x509 = &ssl_data->host_cert;
+ 			st->key.x509 = ssl_data->host_privkey;
+@@ -759,7 +768,11 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ 	debug_info("enabling SSL mode");
+ 	errno = 0;
+ 	gnutls_certificate_allocate_credentials(&ssl_data_loc->certificate);
++#if GNUTLS_VERSION_NUMBER >= 0x020b07
++	gnutls_certificate_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback);
++#else
+ 	gnutls_certificate_client_set_retrieve_function(ssl_data_loc->certificate, internal_cert_callback);
++#endif
+ 	gnutls_init(&ssl_data_loc->session, GNUTLS_CLIENT);
+ 	gnutls_priority_set_direct(ssl_data_loc->session, "NONE:+VERS-SSL3.0:+ANON-DH:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA1:+MD5:+COMP-NULL", NULL);
+ 	gnutls_credentials_set(ssl_data_loc->session, GNUTLS_CRD_CERTIFICATE, ssl_data_loc->certificate);
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..a17d9c8230e8
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+
+# Get patches from Fedora
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
+	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+
+SLOT="0/6" # based on SONAME of libimobiledevice.so
+
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="gnutls libressl python static-libs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=app-pda/libplist-1.11:=
+	>=app-pda/libusbmuxd-1.0.9:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0 )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+BUILD_DIR="${S}_build"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-git.patch
+	"${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
+	"${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	local myeconfargs=( $(use_enable static-libs static) )
+	use gnutls && myeconfargs+=( --disable-openssl )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		# Bug 567916
+		PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	dodoc docs/html/*
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libimobiledevice/metadata.xml b/app-pda/libimobiledevice/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/libimobiledevice/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/libplist-2.0.0 b/app-pda/libplist-2.0.0
deleted file mode 100644
index 29cd3c3fbf22..000000000000
--- a/app-pda/libplist-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
-EAPI=6
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0/3.1.0
-SRC_URI=http://www.libimobiledevice.org/downloads/libplist-2.0.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22bc1c0edb4f53884adb16f8aa7297bd
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
new file mode 100644
index 000000000000..d76efb1d04c4
--- /dev/null
+++ b/app-pda/libplist/Manifest
@@ -0,0 +1,3 @@
+DIST libplist-2.0.0.tar.bz2 421405 BLAKE2B 2f6e22c871ad3b5ace2a2c6aab09706e8a8c1759f1656c5c07164e5b89a1b5eae24d2d7472e0dcca7eddd96b641715acfe5a0a791b0b994ec5fbcdf70627acf9 SHA512 81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee
+EBUILD libplist-2.0.0.ebuild 2060 BLAKE2B e4d2c7f6c0965698c49337513ac4460f2e0b629f10c487ffbf3a143b669e5e99cfe1f43a85576e99715a75bc64279ed61122485d2e790db9c70810780ccc4f17 SHA512 25f9d3ef34947a91244e8e7c78aca6b5cc2337c9c60d0949090f50fd46067f1e07413630070639f1f46a96bf4ce0fcaee7554f3983f9dde415b0273042999c5e
+MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.0.0.ebuild b/app-pda/libplist/libplist-2.0.0.ebuild
new file mode 100644
index 000000000000..af02a8b43683
--- /dev/null
+++ b/app-pda/libplist/libplist-2.0.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit autotools eutils python-r1
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3.1.0" # based on SONAME of libplist.so
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS NEWS README )
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	einstalldocs
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+	prune_libtool_files --all
+}
diff --git a/app-pda/libplist/metadata.xml b/app-pda/libplist/metadata.xml
new file mode 100644
index 000000000000..7cae0531e52c
--- /dev/null
+++ b/app-pda/libplist/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<bugs-to>https://github.com/libimobiledevice/libplist/issues</bugs-to>
+		<remote-id type="github">libimobiledevice/libplist</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-pda/libusbmuxd-1.0.9 b/app-pda/libusbmuxd-1.0.9
deleted file mode 100644
index 89792d1417f3..000000000000
--- a/app-pda/libusbmuxd-1.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-pda/libplist-1.11:= virtual/libusb:1 !=app-pda/usbmuxd-1.0.9 !<app-pda/usbmuxd-1.0.8_p1 virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
-EAPI=5
-HOMEPAGE=http://www.libimobiledevice.org/
-IUSE=kernel_linux static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=app-pda/libplist-1.11:= virtual/libusb:1 !=app-pda/usbmuxd-1.0.9 !<app-pda/usbmuxd-1.0.8_p1
-SLOT=0/2
-SRC_URI=http://www.libimobiledevice.org/downloads/libusbmuxd-1.0.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d61fc83ee3957f5c02caf84f7153f032
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
new file mode 100644
index 000000000000..41928fa27215
--- /dev/null
+++ b/app-pda/libusbmuxd/Manifest
@@ -0,0 +1,3 @@
+DIST libusbmuxd-1.0.9.tar.bz2 265940 BLAKE2B fbdb5ac441a3bcda41b752737f6a5fa9975948d67abf5b1edd9b3e3f749ea65486892af3c679cfcfa5f8d9052f8d35c6a5b0a3a95d07c65385ca28ff7a2b8633 SHA512 f50ee580ac9b4c5e55ab596aabb0bdc09f710cc58edba98699499998c44f2b2cf064792390f235b2221af494ce3233acda699652066b9297cc3cb4e9f8a1cfa4
+EBUILD libusbmuxd-1.0.9.ebuild 893 BLAKE2B 8a2a893ffe6841d57226aee7603f7e623ab270581f36651fb058bf70abb1b3e5fc43168ecbf6e4127a0dc3744bcd5e17e6a647951ebba674dacaf066fb40aec5 SHA512 e131a1a8cb6fda5aa15da73736d2424855e7607d47f5b958b436a7df1d44357945f8a491e10fbc18e20ec9414d186e693a8dd3c99c115b9ce7bf2297993dce9b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild
new file mode 100644
index 000000000000..0e4c4b117225
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+# tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2" # based on SONAME of libusbmuxd.so
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="kernel_linux static-libs"
+
+RDEPEND=">=app-pda/libplist-1.11:=
+	virtual/libusb:1
+	!=app-pda/usbmuxd-1.0.9
+	!<app-pda/usbmuxd-1.0.8_p1"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+src_configure() {
+	local myeconfargs=( $(use_enable static-libs static) )
+	use kernel_linux || myeconfargs+=( --without-inotify )
+
+	autotools-utils_src_configure
+}
diff --git a/app-pda/libusbmuxd/metadata.xml b/app-pda/libusbmuxd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/libusbmuxd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/metadata.xml b/app-pda/metadata.xml
new file mode 100644
index 000000000000..94e264ce8154
--- /dev/null
+++ b/app-pda/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-pda category contains software for working with personal digital
+		assistants or hand-held computers.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-pda enthält Programme für das Arbeiten mit PDAs und
+		Handheld-Computern.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-pda contiene programas para trabajar con asistentes
+		personales ó computadores hand-held.
+	</longdescription>
+	<longdescription lang="ja">
+		app-pdaカテゴリにはパーソナルデジタルアシスタントと使うソフトウェアが
+		含まれます。
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-pda chứa các ứgn dụng làm việc với các thiết
+		bị PDA hoặc hand-held.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-pda contiene programmi per lavorare con PDA e hand-held pc.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-pda contém programas para trabalhar com assistentes
+		pessoais ou computadores hand-held.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-pda zawiera programy służące do współpracy z urządzeniami PDA.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-pda/pilot-link-0.12.5-r1 b/app-pda/pilot-link-0.12.5-r1
deleted file mode 100644
index 9a1d23fad918..000000000000
--- a/app-pda/pilot-link-0.12.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) readline? ( >=sys-libs/readline-6:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jdk-1.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)] java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=suite of tools for moving data between a Palm device and a desktop
-EAPI=5
-HOMEPAGE=http://www.pilot-link.org/
-IUSE=bluetooth debug java perl png python readline static-libs threads usb python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 LGPL-2 )
-RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) readline? ( >=sys-libs/readline-6:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:=[-build(-)] java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebacfedb8041f09fcb0c9d3ceeb496c4
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
new file mode 100644
index 000000000000..d0372b0140f9
--- /dev/null
+++ b/app-pda/pilot-link/Manifest
@@ -0,0 +1,4 @@
+DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
+DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
+EBUILD pilot-link-0.12.5-r1.ebuild 2915 BLAKE2B c2f046807b4e573861361f522d59c318e800114095addac35d7f08355e7152ca35f5d4ba3450ed23ab42df1e3aeb671a6cc667567a8111a3053e42ef344c5dc8 SHA512 9376978300128ba5b930a36a497c4f8ce36640ad6cac9b0ca1412fd285f9202cfba1254f95d2157068cf42f66f44a16b73fc5bd0d59896a3b9bc88fef12acf57
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/metadata.xml b/app-pda/pilot-link/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/pilot-link/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
new file mode 100644
index 000000000000..87cf90a2b960
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools distutils-r1 eutils perl-module java-pkg-opt-2
+
+DESCRIPTION="suite of tools for moving data between a Palm device and a desktop"
+HOMEPAGE="http://www.pilot-link.org/"
+SRC_URI="http://pilot-link.org/source/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="bluetooth debug java perl png python readline static-libs threads usb"
+
+COMMON_DEPEND="dev-libs/popt
+	>=sys-libs/ncurses-5.7-r7:0=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez )
+	perl? ( >=dev-lang/perl-5.12 )
+	png? ( media-libs/libpng:0= )
+	readline? ( >=sys-libs/readline-6:0= )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+src_prepare() {
+	epatch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-{libpng14,png}.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch \
+		"${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	# tcl/tk support is disabled as per upstream request.
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
+		$(use_enable static-libs static) \
+		--enable-conduits \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable debug) \
+		$(use_with png libpng) \
+		$(use_with bluetooth bluez) \
+		$(use_with readline) \
+		$(use_with perl) \
+		$(use_with java) \
+		--without-tcl \
+		$(use_with python)
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_configure
+		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
+		perl-module_src_compile
+	fi
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog NEWS README doc/{README*,TODO}
+
+	if use java; then
+		cd "${S}"/bindings/Java
+		java-pkg_newjar ${PN}.jar
+		java-pkg_doso libjpisock.so
+	fi
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_install
+	fi
+
+	if use python; then
+		cd "${S}"/bindings/Python
+		distutils-r1_src_install
+	fi
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	perl_set_version
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/app-pda/usbmuxd-1.0.8_p20140530 b/app-pda/usbmuxd-1.0.8_p20140530
deleted file mode 100644
index e5227e6ed1f2..000000000000
--- a/app-pda/usbmuxd-1.0.8_p20140530
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1 virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
-EAPI=5
-HOMEPAGE=http://www.libimobiledevice.org/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=GPL-2 GPL-3 LGPL-2.1+
-RDEPEND=>=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ssuominen/usbmuxd-1.0.8_p20140530.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=30e44ef4f89a3e160982750e70a2c0b6
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
new file mode 100644
index 000000000000..db0048ba8088
--- /dev/null
+++ b/app-pda/usbmuxd/Manifest
@@ -0,0 +1,3 @@
+DIST usbmuxd-1.0.8_p20140530.tar.xz 46988 BLAKE2B 8efedee3231b134995316fc295fffd975271aa9d630aa6e3d96ccda472634422299aadb92acda09b6802cdcf9e99af0c165dcbed153d0a5027ffcc8f26126cdc SHA512 200c9bd208ef9e8d5e0a9b2779ff260efe6319333ce27c93a0686ba924e6cfaa1a003072c3eabbe46d495a66bc47c3cd6e82482653fde5e1a7ae0edd9b838fac
+EBUILD usbmuxd-1.0.8_p20140530.ebuild 869 BLAKE2B 0e2e9847b97a06661acff0aa19d8518fa73361211d8e89758ab18c090f6917c412ecf8ad4e00b917dca5ecbce2a82293f52a38b38915fbbe863eb5596261ce83 SHA512 5ac79095dff7495464783e39ad99e15817e72f96c8bad9ee77fa904f21b3bddc5419f708f6639d7026889a282463347bf3ed80d8226b095e28e70a451acdbbf0
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/metadata.xml b/app-pda/usbmuxd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-pda/usbmuxd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
new file mode 100644
index 000000000000..f4c8c46ae9c1
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils udev user
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+#SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+# src/utils.h is LGPL-2.1+, rest is found in COPYING*
+LICENSE="GPL-2 GPL-3 LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=app-pda/libimobiledevice-1.1.6
+	>=app-pda/libplist-1.11
+	virtual/libusb:1"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup plugdev
+	enewuser usbmux -1 -1 -1 "usb,plugdev"
+}
+
+src_install() {
+	autotools-utils_src_install udevrulesdir="$(get_udevdir)"/rules.d
+}