Port to EAPI=5

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

3 files changed, 179 insertions, 17 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 8b2c0c4c355a..c7c657c725e9 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xawtv
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.71 2015/01/29 19:07:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.72 2015/05/02 15:48:47 dilfridge Exp $
+
+*xawtv-3.95-r3 (02 May 2015)
+
+  02 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> +xawtv-3.95-r3.ebuild:
+  Port to EAPI=5
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> xawtv-3.95-r2.ebuild:
   Convert to CPU_FLAGS_X86.
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index ab800b7004c1..648fdf57d2f6 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -9,24 +9,23 @@ DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efc
 DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257
 DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a
 EBUILD xawtv-3.95-r2.ebuild 3644 SHA256 a2b77145d8ba58ac0a16d50b984b169373c529609fac84caf579fa220d16ecb0 SHA512 31ca3a1e3d08fb648ee990e8375e284dff9859ddd279c63373738f086c6248eed0c6b5cd66812dbb5487e50a0abd24266cc7ab995468a1a6e32a74b451665a8e WHIRLPOOL c97015453f85e1e152076cb1d2b53c74aa51ebd9cc7e209d5043c0cc12a5a28febc845cd01ede7b996aafb295f1bea01d75c241ed61dcf56f89b808238edbcc1
-MISC ChangeLog 16200 SHA256 223b1ccf186280927dbf94b17a3e2d85df4f3e893a74855fb6ab74114e92c1ac SHA512 c2e96eee44f5a4697a741f6704382af50b052c53ee8a628dd25a5c7857c716237852b95283ab4051cd3fb11597c155779b55af7f6a768b16e7db99c0d5a2544e WHIRLPOOL 58ad04c39a86769696771ea53391207d86c9fd5baebc74b61c20c06f6fd22f7b728b09cc35d992c552fc46b9b3a10f1bb8801c1129aa73e831f1faecdc60507e
+EBUILD xawtv-3.95-r3.ebuild 3644 SHA256 4bd6f183bac0db2b63fb3fdecdd0c83b0dd9e5977ac35e8a706703b69814e878 SHA512 444550a6a59ffd449d1814295b2607f0e71147dfac96f490360f830b89d840534e0fa9221cba114a6da3402688ab821d571068cff002c745c9a2c9915c2397d3 WHIRLPOOL 17da914c85515abbaa290b4e9ce1437cbfbf6d3e45c325bb5c4321f7bed633d37f62c628c0c98434d949a52706f0fde4180109faec1f23d2172dda5e21f182f2
+MISC ChangeLog 16331 SHA256 5bb946ebb15f029eb378268024f04f49fb0ac3d96d1d367b045f2e838df8e5dd SHA512 d5626635be13acf774c07412b71d02111c72183cd7b7d66653c795e3543de83b0fb59330b46db4692c33af1395b402fe2b2adadb3afbf2fba9c79f3a1f9e89bd WHIRLPOOL a49816918df3861ebb292a13e3cd8c723b2ead9a7bba4b1de8cc2f50f30ddf45c6ebf3aa0eb35e004171f7153666ee4ec62fa40b3c08cdd0165044d0605eb657
 MISC metadata.xml 328 SHA256 96f627b19b6b8c71bf35895cbd63e4e355caa23579e5879ecaeace8c37f1a7c5 SHA512 8737036a68ee39c0127d936f3159db10f6ab18dbd60c99f64373a4f6906aa7cbbb8bfaa69329b0127673485bacae7ffeb5513eaa9cf019a365bf55d30fd1c001 WHIRLPOOL 15548da907b989cf27e9b575604719f26b51db63324e4e58185c0afa78c9d1c9a93cdf8115ebbcc52a0aae7ff7243dad5da4b0a4107c69b5237aa735c8400884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyoUCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOsv4P/j0J9ViHtK4MF+BCfrfkmUgK
-yp7MwPtosWej5vP6iTFt02B4UN2kZxwhbF+VMCbhvMWGviGMGTYfzsl8dw3s9Mm1
-viqRN4OsOwHBq6lbJavoIOpgTgNs5KfWq632x2ejTGZDnag8k2Yp7C19n0qaEwFk
-OT2evXZHzmwita0ZWcskBafg06LbpK58yrDo9KcrDHWgXHHxA7yv6gc4vwSEUakP
-7qGkOh5yqNvwHUnq+i3i1wLkAbIAQlmev0XMcekLsrVzp+ImJWKTTjiEvI60lKIP
-ahW/u3mK1Q8tFJKEoGwG4liW+q1pPQRjPyf/9mD+hdtoa/sPnXiX5xIEphxyRirQ
-CJhvqofWdIw6SlFokGbzFR4GgSa6qz9PREOHZKp4FoHsUZ50WeVM/AfXItLKGxUn
-GKmzfX9I/JEUHpgwigzBLlwLu9f3xO7BuoGydL4xPzYa3shvKDGdqzFpAyA53ntc
-XRq7HzDrjAHLyGQBTf/DjH2DSBLg13ENIwlYxOtKwTFLRAKdjsrmpI8rDOlbjAsP
-qTe7zZP/AHQ9YQau0r0r6CRKRnowJmDBiiF3uVTFWOZZySgFvJV//Xggx8xA4BBz
-nZ8kuOR0eBwBLAfwxOBeolTue/rsWgu/oxULYVQMFFe8c5lU4Zht0BjB6g5soloK
-KxnfqFyg6XMRhexI7vBB
-=FJFc
+iQIcBAEBCAAGBQJVRPKyAAoJEB9VdM6hupKVscMQAKEv+0gTHFQ6L1njzJZ9mjJb
++6aABxZC+yHzHM+0uEbtG+ybxQFO8ZR77xcgDZGmKqHc5axUHylUAti6lf90JxCb
+pWnD1+VX+3e/mPFZhxIMaWm8gaEA3kCtWT2qDrlxAzQ+MQyi/oD39EBo5wG1Mew2
+ooUonlS+0gxkWXIuO94bZzhAQpX19J5XrgGmeJ5pxm+3SwrKLzaOiCX5ZGIxhCw5
+VrqvS7epD52QIRvIdGnYm+bW0S2HqTVQ87pBkAluVwUoT4+YRS0NlD55nr6oK4It
+zVqermBVA1Pu40nRogTEgGxz7eWz/E8hxcJ+/uyvtEDQQyk16OtD2dXDc8NbJaTz
+UYQX/FHhJTJRqYV7F9o/vCVeB2zpYgNGyJTvuW71pYvsMTcVTryl0udr1Ul5Kt9l
+ohvG+9mAUxk+ROgePhVoY/ELUyh5W4w4972gYY/90qR2wb7b0+5og2ztfpM/rsA5
+N8xWsvqi+lVF5mU/oE9WB5iI62HyEONHX9ql86cD+wD1o3pMhVpwOlzqzzeyJrVr
+NO/9fsgTAe1nPDKMmj/R1lkhtKlb6XM3bp/I2ny4k7/f0okviuoFv41f/C2a3mNZ
+MQlTrOdRg0VXKcIv5eQG7czPMJBM9lBa8K8PUn1vEBHpjixXVzuhY4JRC3zU0isH
+CYdTNqOLo2nf4uhai/LF
+=CDBX
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xawtv/xawtv-3.95-r3.ebuild b/media-tv/xawtv/xawtv-3.95-r3.ebuild
new file mode 100644
index 000000000000..7ce20a86dfd5
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.95-r3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r3.ebuild,v 1.1 2015/05/02 15:48:47 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils font autotools flag-o-matic
+
+PATCHLEVEL="4"
+
+IUSE="aalib alsa dv lirc cpu_flags_x86_mmx motif nls opengl quicktime X xv zvbi xext"
+
+MY_FONT=tv-fonts-1.1
+DESCRIPTION="Small suite of video4linux related software"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://dl.bytesex.org/releases/xawtv/${P}.tar.gz
+	X? ( http://dl.bytesex.org/releases/tv-fonts/${MY_FONT}.tar.bz2 )
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/jpeg
+	X? (
+		x11-libs/libFS
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXrender
+		xext? (
+			x11-libs/libXinerama
+			x11-libs/libXxf86dga
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm
+		)
+		x11-apps/xset
+		xv? ( x11-libs/libXv )
+	)
+	motif? ( >=x11-libs/motif-2.3:0
+		app-text/recode )
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	dv? ( media-libs/libdv )
+	lirc? ( app-misc/lirc )
+	opengl? ( virtual/opengl )
+	quicktime? ( media-libs/libquicktime )
+	zvbi? ( media-libs/zvbi
+		media-libs/libpng )"
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-apps/xset
+		x11-apps/bdftopcf
+		x11-proto/videoproto
+		xext? ( x11-proto/xineramaproto )
+	)"
+
+pkg_setup() {
+	if use X; then
+		font_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		epatch "${WORKDIR}/patches/extra/${MY_FONT}-nox.patch"
+	fi
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
+	epatch "${FILESDIR}/${P}-pagemask-fix.patch"
+	epatch "${FILESDIR}/${P}-jpeg-7.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# It tries to include FSlib.h directly, but this seems to have moved.
+	use X && has_version x11-libs/libFS && append-flags -I/usr/include/X11/fonts
+
+	econf \
+		$(use_with X x) \
+		$(use_enable xext xfree-ext) \
+		$(use_enable xv xvideo) \
+		$(use_enable dv)  \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable motif) \
+		$(use_enable quicktime) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable opengl gl) \
+		$(use_enable zvbi) \
+		$(use_enable aalib aa)
+}
+
+src_compile() {
+	emake verbose=yes
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		emake -j1 DISPLAY=
+	fi
+}
+
+src_install() {
+	make install DESTDIR="${D}" resdir="${D}"/usr/share/X11 || die
+
+	# v4lctl is only installed automatically if the X USE flag is enabled
+	use X || \
+		dobin x11/v4lctl
+
+	dodoc Changes README* TODO "${FILESDIR}"/webcamrc
+	docinto cgi-bin
+	dodoc scripts/webcam.cgi
+
+	use X || \
+		rm -f "${D}"/usr/share/man/man1/{pia,propwatch}.1 \
+			"${D}"/usr/share/{man,man/fr,man/es}/man1/xawtv.1 \
+			"${D}"/usr/share/{man,man/es}/man1/rootv.1
+
+	use motif || \
+		rm -f "${D}"/usr/share/man/man1/{motv,mtt}.1
+
+	use zvbi || \
+		rm -f "${D}"/usr/share/man/man1/{alevtd,mtt}.1 \
+			"${D}"/usr/share/{man,man/es}/man1/scantv.1
+
+	use nls || \
+		rm -f "${D}"/usr/share/man/fr \
+			"${D}"/usr/share/man/es
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/share/*.list "${D}"/usr/share/${PN}
+	mv "${D}"/usr/share/Index* "${D}"/usr/share/${PN}
+
+	if use X; then
+		cd "${WORKDIR}/${MY_FONT}"
+		insinto /usr/share/fonts/xawtv
+		doins *.gz fonts.alias
+
+		font_xfont_config
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		ebegin "installing teletype fonts into /usr/share/fonts/xawtv"
+		cd /usr/share/fonts/xawtv
+		mkfontdir
+		eend
+	fi
+}