Use new ffmpeg/libav USEs style, autoreconf is needed after applying the patches (#552224 by Marcin Jurkowski), use readme.gentoo.eclass.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 97 insertions, 20 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index 1147bf3565bc..9dc2cfb56421 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/motion
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.46 2014/12/28 16:00:19 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.47 2015/06/24 20:08:42 pacho Exp $
+
+*motion-3.2.12-r3 (24 Jun 2015)
+
+  24 Jun 2015; Pacho Ramos <pacho@gentoo.org> +motion-3.2.12-r3.ebuild:
+  Use new ffmpeg/libav USEs style, autoreconf is needed after applying the
+  patches (#552224 by Marcin Jurkowski), use readme.gentoo.eclass.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org>
   motion-3.2.12-r2.ebuild:
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index f8e1f43e1a5b..25d699baab58 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ffmpeg-1.patch 3333 SHA256 8493a859745901708fc9e1d6411a2ecf2b389f50c8ff86300efcbaeaf50029e8 SHA512 9cde33b50013d22969f900c0cc94af8ca0d083a27c18e5c9cb49943da09056eb6f91723d72c14cff99528e96d075c87f6685a09228fa47f1dddff3f51423ed8b WHIRLPOOL aff0267302f8be0d8727da53f29ebe6fdae9e84448f649ef264a9aa7894446da610f1b5b729aacc0fd3020851141439dc0fb8059ad15cea9688614115ff14182
 AUX ffmpeg-2.patch 4736 SHA256 34fb37de0c0e05b02fa5ad14ce9dbf8a108b162a291e70e0ee345f9f76885993 SHA512 4bc8c0a123c55a9b4c365c7e00c35e712a4e7043338610672de56d2dd5f31bafe09384675235f08781abb07fa9a919954eb7bfd764825b15fcc6c6a412fe7d1b WHIRLPOOL cef04e472ce52328daf863e4ecbc138be459f97d805f5371b0ff788b54fd4f10f87dbcfc296dac04de2d7d2f84173d9c1aac68132ed43e3ee97736fe0fb3150b
@@ -12,24 +12,13 @@ AUX motion.confd 99 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a5017066
 AUX motion.initd-r2 904 SHA256 a862507d2b0096efca041768a21ebeaac1733211aa008ebacc73fd4c214be6e0 SHA512 5fc1c01fa4dad1db6ee205cc22aad5aedfc4ba0ba9947ab87705b77a10be1325d15cf815b1758c656f259427e01456bbf8a7299d17182ea4e91fdaff746f9757 WHIRLPOOL 65dd450d49cb4a50486d02e6c9b4881bcb282dfdda79566ae56f27b48ba90e200853672e6d356d0975b075c1aa7eec0a9954ed8af7cc2c5eb5b2a216dece1f10
 DIST motion-3.2.12.tar.gz 425729 SHA256 a597f8d7ec0bf3c5fb62722c4eead59717fe01c2ae0d256c642027cea74b2f0a SHA512 d44620f8865420da71ff1dc1e1d8ba8e5465b395f2cf3b2cc9a91d3d415694b26376a9f8e3a1b78ffd0efde22d9e0338daa77237aed38c060dc3577af4c0864c WHIRLPOOL 0b7618d48161e8ffefacc5331d1078004d87839b532100c37bfaf06e99772921228feea6eea063301dfdc9e5f5a1dc07fd0847858440c6f876c1e03deaa078c8
 EBUILD motion-3.2.12-r2.ebuild 1890 SHA256 e8fe036b4a8f8270f6d04223b343311fe9f3eed3c53942905a8b08fee455e64f SHA512 c59d548903ffca1121c2f0e16eea93a9e7529530b1a9f3e698808afeda0e8374e71cc8346c347f7b01bcf7e9893dd7520d7f1d6f0708b66e4ce2a1b5124f4e6d WHIRLPOOL bbd8293ac22e8b3f384d3641654b361d84741b5bc97eea3860bf261a722f49437acdc21e865b97869779b87eec75fd5ca600e7b8a670b1dcc6d1c2b125274d68
-MISC ChangeLog 7518 SHA256 4a9dd7925fbde05a7da3cd4b15476df74aaca50510191e80824369bb1f6b5281 SHA512 9951c7bffc5df26f94980df4d1667162a9f7d4fff45a901b9249f634f448538d8fbb66572636cb46901704c20e57e7df21e6669cde31e6238c6da527b47069d1 WHIRLPOOL c4a3f943a9078943eef488c4a495e1802a20f3542caf57f92c8f564599e6a6e9bd326daaa01d51b1ba0be9e598e0aedb5b16b849b13ef8497c31b2681b1e0a13
+EBUILD motion-3.2.12-r3.ebuild 2010 SHA256 fc26b0f2b9164204f461a058f990cf7a59b5e1eba424f21ed6872454754ce8a6 SHA512 2372512fc3d92fd02d40962bba3dd2e5836c9326bc2c9e3b0ce1a86e299df28981f17b65bbf495c60103c58e83c66c247d255984a6208559b0fc3d9c78052e69 WHIRLPOOL 8991d489b4caa39b3ed8d9107ccd2e17829e60dd81fd9df40d9b08eaed9760114e6c3a3eececa1f51ac3f58d8e2d6bd51459e4b42ae6ec06bd900cf6e9239f60
+MISC ChangeLog 7761 SHA256 0136f08599023a6bf6e89d64ad5874b6dfe04f7e5047df37376d30b688bb55ae SHA512 74968c7f4f86ef583169c5d865c2bd9a71635c758d4eb451af7a049811478caf988830306d84cba4e5873fe1e0f17e65327f11db0a9574b7ebae837cd3341157 WHIRLPOOL f39bb60eba7116b50658144055cb0b9d212db018a8f4bc315d74b615053264fcdefe7c92701d620ba11381ed7bccf8f4bd42b3aa555b5f7da40b6496fbbd783b
 MISC metadata.xml 304 SHA256 3b7eb17778c90e0d6bc52f8bc0b7ab10676097bd32424ba29ec964e2060b9eb8 SHA512 fe8238152da113ec11d703afe6c51961b3db43de3ad9a27ced56ffde65183a5ca15c22d422b096b718693b02d31d00ce0f46a4f47749be60adcfc2bba0b7f14e WHIRLPOOL c5517783b3be2f72fa93c913711d5c957f4fb03f86311a5bdb40ed0d1d51ac23833618fc48f1205a07f9111f1a51de5fe39615b1edacb5dcad2b92a09df5643a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfwTeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmieLcQAKKW3/YgGaGDgBTKsDiEggDL
-cc735WuN/gP4U4mb+0C6gSKV96de06X1T+0NhG0U0Nr9hPqVMAIQaMz2eKhc3sou
-NqXupkfIr3aNrofc6VNx5SRWy12uj1HoqADpcdiPVr0LHZS6sjoXjwffSP10lQTx
-sb7jtc3Q556CWu0j8XNCbqt66OcF8hZC9noCHz5JOxTYZFpSfj8hKislqzexCrwp
-nwLHIkWM2Y+ZiL4I0sXVQMbHLkUoK3AtiV4ZVs0+MKw9QEAQm2scDc1HWhLf8XqE
-Div5viIhzNXnGXK+Ob/dL/CRw+XE315cQKDHf+mylZQz6FL0g/2JSzZZpRDWqOWd
-BnldsB7CXf+Yc/QnhimPRnd+aTzxLPlLmPGyzvpbwNWyzqdWa40BPvb70oYqt+4A
-CjDbdi7ZXkxCRyne6VHZQXwcdb0D1T8wlbXKJgYPeAyBfVmkF7yFwo4AhhUg/R+2
-WWa3YOtYwuMdE5DFMadlWzMhShkdPiHoHgW20XSNGcRxws1YWErkA9KEmMU29OjY
-zXtj0kcCDYk1E9CApG/+dMY1DKgHI0IX5X9TGV83nR4l1VFaKQN6HwwCzCucxt7u
-mvo3tsFhPJyjyqfzgjZUSzfn+GKaHRFQG8GdmfPcLFUIO0Re5wDVLxYowy/UtCj/
-dkTfM0rsUAy/RcOi06/2
-=akHv
+iEYEAREIAAYFAlWLDksACgkQCaWpQKGI+9S+CwCfcVcoVah0L3C/zog7+h296Dho
+BugAn1ZDLpC/cjr6jvjGfgJ6YCLzj9OS
+=T7n2
 -----END PGP SIGNATURE-----
diff --git a/media-video/motion/motion-3.2.12-r3.ebuild b/media-video/motion/motion-3.2.12-r3.ebuild
new file mode 100644
index 000000000000..d679d9997c79
--- /dev/null
+++ b/media-video/motion/motion-3.2.12-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.12-r3.ebuild,v 1.1 2015/06/24 20:08:42 pacho Exp $
+
+EAPI=5
+inherit autotools eutils readme.gentoo user
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+IUSE="ffmpeg libav mysql postgres +v4l"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/jpeg
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+# note: libv4l is only in dependencies for the libv4l1-videodev.h header file
+# used by the -workaround-v4l1_deprecation.patch.
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers media-libs/libv4l )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to setup /etc/motion.conf before running
+motion for the first time.
+You can install motion detection as a service, use:
+rc-update add motion default
+"
+
+pkg_setup() {
+	enewuser motion -1 -1 -1 video
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/ffmpeg-1.patch \
+		"${FILESDIR}"/ffmpeg-2.patch \
+		"${FILESDIR}"/ffmpeg-3.patch \
+		"${FILESDIR}"/ffmpeg-4.patch \
+		"${FILESDIR}"/ffmpeg-5.patch \
+		"${FILESDIR}"/libav-9.patch \
+		"${FILESDIR}"/${P}-workaround-v4l1_deprecation.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with v4l) \
+		$(use_with ffmpeg) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOC='CHANGELOG CODE_STANDARD CREDITS FAQ README' \
+		docdir=/usr/share/doc/${PF} \
+		EXAMPLES='thread*.conf' \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	dohtml *.html
+
+	newinitd "${FILESDIR}"/motion.initd-r2 motion
+	newconfd "${FILESDIR}"/motion.confd motion
+
+	mv -vf "${D}"/etc/motion{-dist,}.conf || die
+
+	readme.gentoo_create_doc
+}