From 76d89b4f1fc23ce547d91c856b5b92b62cb3cd44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sun, 5 Apr 2015 23:23:03 +0000 Subject: [PATCH] Fix build, bug 456802. EAPI=5, drop to ~arch since nothing depends on it and stable fails to build Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x0B08240A96F66571 --- media-video/xvattr/ChangeLog | 11 +++++-- media-video/xvattr/Manifest | 33 ++++++++++++++++--- .../files/xvattr-1.3-pod-encoding.patch | 11 +++++++ ...ttr-1.3-r2.ebuild => xvattr-1.3-r3.ebuild} | 16 ++++----- 4 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 media-video/xvattr/files/xvattr-1.3-pod-encoding.patch rename media-video/xvattr/{xvattr-1.3-r2.ebuild => xvattr-1.3-r3.ebuild} (77%) diff --git a/media-video/xvattr/ChangeLog b/media-video/xvattr/ChangeLog index 1a85e2df8f0c..babc0a6cb00d 100644 --- a/media-video/xvattr/ChangeLog +++ b/media-video/xvattr/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/xvattr -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.25 2012/05/05 08:58:56 jdhore Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/ChangeLog,v 1.26 2015/04/05 23:23:02 dilfridge Exp $ + +*xvattr-1.3-r3 (05 Apr 2015) + + 05 Apr 2015; Andreas K. Huettel -xvattr-1.3-r2.ebuild, + +xvattr-1.3-r3.ebuild, +files/xvattr-1.3-pod-encoding.patch: + Fix build, bug 456802. EAPI=5, drop to ~arch since nothing depends on it and + stable fails to build 05 May 2012; Jeff Horelick xvattr-1.3-r2.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/media-video/xvattr/Manifest b/media-video/xvattr/Manifest index 9517f3bf4208..5ba23141bbce 100644 --- a/media-video/xvattr/Manifest +++ b/media-video/xvattr/Manifest @@ -1,5 +1,28 @@ -AUX xvattr-1.3-gtk.patch 1255 RMD160 b82fca7bc1cbfb757b8c67f4ea92e3b8118a97f7 SHA1 b01ac9462279a52f3fa304bc0b9b0393d43375dc SHA256 a82dc71c0b5bfe18ddd6045131978d4077e9a7294fc36064795244031a52655c -DIST xvattr-1.3.tar.gz 82263 RMD160 14dc247eb31e2eb7947089cebebba4443ef01ee0 SHA1 6f6743aa7a1696727cc83bdf77e2baa63c090750 SHA256 1cedc0b4795e6f4234b1d52172f74d7163ecb8142fbb35dc86c905df5478d8fa -EBUILD xvattr-1.3-r2.ebuild 920 RMD160 9ceee78ab72930e71d02a482b16f9c6e1c870c69 SHA1 6abc0003f1be568608f0d4a81801341e376c55af SHA256 821439e17eaa0873e6c3a231e9d6d95812887de3dbf36260514cf30f6db8d421 -MISC ChangeLog 3251 RMD160 84f6e8dfe5271bf7635e51fae1a1e6db384f590c SHA1 5d6dafc0733a016fe5aa2f9d62201571dc40452f SHA256 db7df4bb75d5da996b4af285cd14d0ad84a27c5d19b9368ea5339b4ceac41972 -MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX xvattr-1.3-gtk.patch 1255 SHA256 a82dc71c0b5bfe18ddd6045131978d4077e9a7294fc36064795244031a52655c SHA512 a81015dfa6c556d99e27765e9d793d1ab745925be212c8a3c21503ac73a6d7bbae5642e7cae067544578e7a1388968a354b759e72edcde1ccb0fa704c929e138 WHIRLPOOL e3b77e320baa8a6f43fd7a28a625cd12b4cc48db24f3525d3181ea7fe25b586cafa13e065feef162e7b7bdb5577813d89a387920d3414596c468d4e330e7a6ab +AUX xvattr-1.3-pod-encoding.patch 303 SHA256 a1282de99e49fed3e43a75868698b54b89bbb09ea2d800605480ab9823fd0079 SHA512 84be4a336efa6caffbacf15f2b68ddb1d6b60cc8212593662194d7a7df5891c6d5cefcb28c25412471e5e943359e6c4f076b77f9c92d1a93e084597d39697484 WHIRLPOOL db393f2a0a2d9e50c531073e12823814be92f1e7fe384015a58951c4cefbf81c39e040926b6cb30fcfde3ddbaa065ace24abeecddc7b4115a79ff20312b3149d +DIST xvattr-1.3.tar.gz 82263 SHA256 1cedc0b4795e6f4234b1d52172f74d7163ecb8142fbb35dc86c905df5478d8fa SHA512 f7b9f9f46961458be6aebfa5c40b28ab0757220ee5a20bcc3b635eaf6912afd7ca2ee9e9d0cfa1894e8ce6c97433e23f78f307fa216d16b5628b8b37202120a0 WHIRLPOOL 91e3f0ce13d7a33bcc909862493165ce74e1b2eba7e9038046f8152166aefbf8e0a1b29883b80d85e599f242a8833317787091a391633fdec7ce9fc7cd427b6e +EBUILD xvattr-1.3-r3.ebuild 921 SHA256 ce6b31b27c7932e5b7d70653e07ffbaf2a6896852366701334297bde8c335a07 SHA512 db2c7d4169a93d0c1c8844d0bfd2fb1a66c98850e059063641c0ff9b98ffcf5912c69d95c770f3e895fff75b15ee2bfe7a5c0b210a7bd9c18040382352745b95 WHIRLPOOL 94c92c44d24dd959d9f6b7c729dd8e91ab70a040d449d9948c2761640603f896adb66c0780294e3e8d667392007e5151c9c42045d108d38d721c6167c7e6723d +MISC ChangeLog 3531 SHA256 53775a445a25d3b4c152ca7a401c7498c389dc6ee5da01644f7b59c282282a4d SHA512 3ce4855bd4cd6043010dabcfe495d1d5371d8000bebd18c35a1e7466c81f414d551fb8f9dc23f6a58259a7265bace97f69acb490e2697875867d89549d372bf6 WHIRLPOOL 6ada9770e43cc6eae69e23bd5494215e184b31a8b3dfec0e5b0a0ae701a913813e68a77d8d44d048dd3d6a2f6daef7b6722dce3491c4f9acfa204452d8d1bc53 +MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCABmBQJVIcPXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF +MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d5qc0QALjoDL6TPsA3omRj99Po3NN4 +6KaIF2u1h1RzMZIMKV0jzEuTcp+Ogt3TOlKmsQr6ny6crY9FBJKxzMWIqSuSw/kr +rDIEnCmI9rwq/5ZXyzZYVJ+US1DNo+blZCmVWgsu37IDZBBuHu6B+cB5/6B7sUAT +82jnlLRo15ACEHegViR7NU2TOMCoRdKNqVUyWmM6kWiZPsMsN8eOURHPSB81stio +qWSq9FwQpteJ6MW+/y57X1KFFE52SM7/ds9Ok6jMmXffBJnn8fnBR62n7dNZxGPV +PdF7jSTF5kYHV1ut3z1wsiHorNMalhUcO3rDd9i+GL83DR9podva21Gnkl+hOecw +N0WRhZrmhJ1toMxQAidV7Z7Y/sIsQDOZ5KfYGcdsM6bsJHYkBlNMSZZRBhKMpiG7 +U+0C0oaD0s2RaaL2oKvcCWtjSEz1opOHqKWRDXS9aonoZYcKs4+y7tjU3mhngJ3l +LOOSfHuDSzbBecOh2NVUCv8TrF60y5bWHR1zLuMsd3hAVtlbWQ8OG+lY/cLLtV/t +K2vk6GGiYtuhfzGIzUFRRqLYQdOzd9ufMX29KDE+yx0igQq29Zheh3krqZm2Ch1n +S6HQ9v98D710hTtLj+VvIwqNV9YlEv3DVHlEUolHW4YPkx0KAB1W8AS8J0MBFIIA +Tfu76k7EQ5mq++0WhQHI +=Vs7e +-----END PGP SIGNATURE----- diff --git a/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch b/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch new file mode 100644 index 000000000000..29343a240613 --- /dev/null +++ b/media-video/xvattr/files/xvattr-1.3-pod-encoding.patch @@ -0,0 +1,11 @@ +diff -ur xvattr-1.3.orig/xvattr.pod.in xvattr-1.3/xvattr.pod.in +--- xvattr-1.3.orig/xvattr.pod.in 2014-05-18 13:22:59.321022155 +0200 ++++ xvattr-1.3/xvattr.pod.in 2014-05-18 13:44:38.286711743 +0200 +@@ -1,5 +1,7 @@ + =pod + ++=encoding latin1 ++ + =head1 NAME + + @PACKAGE@ - Query/Set X11 XVideo Setting(s) diff --git a/media-video/xvattr/xvattr-1.3-r2.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild similarity index 77% rename from media-video/xvattr/xvattr-1.3-r2.ebuild rename to media-video/xvattr/xvattr-1.3-r3.ebuild index d1918960d812..dd5ade2becc1 100644 --- a/media-video/xvattr/xvattr-1.3-r2.ebuild +++ b/media-video/xvattr/xvattr-1.3-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r2.ebuild,v 1.7 2012/05/05 08:58:56 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/xvattr/xvattr-1.3-r3.ebuild,v 1.1 2015/04/05 23:23:02 dilfridge Exp $ -EAPI=1 +EAPI=5 inherit eutils autotools @@ -12,7 +12,7 @@ SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz" LICENSE="GPL-2" SLOT=0 -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="gtk" RDEPEND="x11-libs/libX11 @@ -23,16 +23,14 @@ DEPEND="${RDEPEND} x11-libs/libXt virtual/pkgconfig" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-gtk.patch + epatch "${FILESDIR}"/${P}-pod-encoding.patch eautoreconf } -src_compile() { +src_configure() { econf $(use_with gtk) - emake || die "emake failed." } src_install() { -- 2.26.2