Rename kino.rules to 99-kino.rules and use udev.eclass to install it into correct directory wrt #438350 by Sergey S. Starikoff

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 28 insertions, 20 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 8a09adfa6666..7c276ddef7c4 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kino
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.131 2012/12/02 17:06:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.132 2012/12/12 11:43:54 ssuominen Exp $
+
+  12 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> kino-1.3.4.ebuild:
+  Rename kino.rules to 99-kino.rules and use udev.eclass to install it into
+  correct directory wrt #438350 by Sergey S. Starikoff
 
   02 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> kino-1.3.4.ebuild:
   Pin gstreamer dependencies.
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index c46e25f225a5..31e9917c2db5 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 AUX kino-1.3.4-libav-0.7.patch 2001 SHA256 8397b6ca5abd86683a3998d6b283875cd49de64c99a79478549d01b518af0c3d SHA512 f4e52546b3451684add1ce5d539b1630d476e0a6889da0f7b3d827cab0ba5d7dc1b5febaea735188886fdf7f8012402c8aa6baa73aa6ae7ae204e035df33394a WHIRLPOOL 259370caead517108f318676b15f199884b69392730b1c447c101c597b6be42eadf4fc99055031d34f777dcd77fdd2b7a57d5e6c3f8f7c17cdc435bf3cee697e
 AUX kino-1.3.4-libav-0.8.patch 2622 SHA256 a3774d953a9a00df766129e4b8a8c7baf3bf6fd98df6c3e9f4a30c159035d4e1 SHA512 736eeb8f6902704166f48975581ebf2eb9e9edc6da8883d49e5f3710679988da57d796b5a926f27282d88584451ff03983402de66a4a707171674ad2de63d4d4 WHIRLPOOL 0c576267b21488809047f6d12cc37144bb84d2f73859d80bb8febab3061685f18592fe7864b4c0977d32bec01bdaf6720e38f470a3bc4f610202110f50a92668
 AUX kino-1.3.4-v4l1.patch 635 SHA256 1987582a359314203a3c56982e640d9f26baf53c7c78655e2f47f510c3f2fb06 SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77 WHIRLPOOL 0bf4205b96fef2ba93014f42545d9bbbb2dec29f840d87caefcc4bc29987c5712e95790cb9dfa7b7698a5f7d78a6e28be4f36dc441497f08ce0875eb70d03f67
-DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08
-EBUILD kino-1.3.4.ebuild 3447 SHA256 181920a832495efdc3b33ffada54f1b2a6fd6b0bafc79f2f8246663d023df84e SHA512 792e21fac4ad95084b90c256109a74c28665984e5dec1b7c5089dac085e705d8e996accaf4ec91441c7b764949c5ab4c647bf0d3e37faaf1d75e60a89c459eb5 WHIRLPOOL db5eeea947715990f88b7870842757741d87f5985c84184ee0a887d08494e192d2b0edf3410f80d46be5d495bf68af5f4c516472a47015c95ba847a384d3f650
-MISC ChangeLog 16392 SHA256 73472934eb6985774a404cd366864444786f964f0219f5c769707808c2ea7ee6 SHA512 7ae538567f8056e034f3320cc73f70373782078bfa504e4494afbf448cee88fb1a6cb9fa525988f2e7322444e4d4549ae16ea8fe120c7928d9abc561d380e582 WHIRLPOOL 9aa47cb4ac142e1a21c51dc6fac70865f6e18817c3df7be89bfcfbb27e5fed3aa0c6f71c58d8accd343ca50365b27dd7755b18b2e94e87dd5ec864501b3d7770
+DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 WHIRLPOOL 9d7ecc79d23dd8d8c4c0b64da2cd425f48305a81da6b6ae6acb2cad1f4b78fb9ade26ef0e8d36c560aa5f6340fb7221ac7ff3f08b1fecfcdea7d0b7d9614c034
+EBUILD kino-1.3.4.ebuild 3438 SHA256 0b2814d2faf6476142cda73421a4980bccc1b46b704dd9921efd093d578aedcc SHA512 b264a8fde715912d8de6ed87817bb0e3dddf6ab20c5cd28269096cba87dd624a1f2b8450f7087b64b0988bb38322ecf037780b7aaddd8dbf2015ebb71c58a7b4 WHIRLPOOL 7affddd3cb9d230e363b2fbf72e8ef68d1118a0ee9f8c4a1ea5781d253060a40903915697da61a7b93b1144ada256a269afd637d6caf7ff7530035e8fd9a6f59
+MISC ChangeLog 16603 SHA256 be00340ffdde51ae72082decfa6d089c3e14819b74c784e491427caffcc0ff47 SHA512 e83ecea84b9171a39b56be1abaf083e6ec0e4e0252550bf337eddec16e2419135e0c25d6bae5f776de9fd8bafcb27567d39f849cb10f7d64a89521743e9ab1d5 WHIRLPOOL 0fde262844675124cf8804fc0341d464a3f153020d9860a41ac6373c21b4924f17406a33c49639c417de1b6b8942c23cea049ca936b8715b22b3a11cd82e8724
 MISC metadata.xml 357 SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb SHA512 e849f68186ceddafdc574981e0b6404cf70518df22025b0586b65e9922cc201a5b8a98564217730b1c918b6ee75896c6612e96e2437fb1ff48342afd6ca3e45f WHIRLPOOL fc259d23bb02f76b0ece30aeefcbdedf27051f520a63a8520eb958a0471baa5e4fe780b1029aff0c00a047a9a7588696764dd2c282a74d9727b80a8e1c2c3562
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC7iqkACgkQ1fmVwcYIWAauQACfcbwP2DrK2N0Dz7XpoDCLR+bo
-F6IAnji3rcR3iEbVrN1hTaHVupcg3GPT
-=Fsy6
+iQEcBAEBCAAGBQJQyG38AAoJEEdUh39IaPFNDvwIAJfs2ZrqRPo+tznvQ76vfNBn
+OIBR542p7U7ioumKO4TMqrJjw/SYIFPFfYYHidVVPt0fKqOPfYlCqBV+qZJqyRf8
+qqxaCXnUgDRad7uli4RVmfpLbE4l4obJAgLWupRiOJkFCnUNDZOHZogdK6Qxr82G
+PP1i6sauROv21ILmpbVAvEzckK5CU71h+nKG13bTecuqC2+KNIfttMvjNQgyIXJR
+RodjSftxCWHiKV361krx+30/fry3lcYXaSvhkkbZvYNNf/Q9hxYO0cIUZKhoyCTx
+Do9PS81Df876CWTERh9uQH75BctTTx7OJh2/u+mdkgR37x6oLbxMXRTTTT6ntrM=
+=aThs
 -----END PGP SIGNATURE-----
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
index d85c8336cb4a..70a79bec37e6 100644
--- a/media-video/kino/kino-1.3.4.ebuild
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.8 2012/12/02 17:06:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.9 2012/12/12 11:43:54 ssuominen Exp $
 
-EAPI="4"
-
-inherit eutils
+EAPI=5
+inherit eutils udev
 
 DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -54,10 +53,12 @@ RDEPEND="${CDEPEND}
 	sox? ( media-sound/sox )
 	vorbis? ( media-sound/vorbis-tools )"
 
+DOCS="AUTHORS BUGS ChangeLog NEWS README* TODO"
+
 src_prepare() {
 	# Deactivating automagic alsa configuration, bug #134725
 	if ! use alsa ; then
-		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed"
+		sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
 	fi
 
 	# Fix bug #169590
@@ -66,7 +67,7 @@ src_prepare() {
 		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
 		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
 	\$(LIBQUICKTIME_LIBS) \\' \
-		src/Makefile.in || die "sed failed"
+		src/Makefile.in || die
 
 	# Fix test failure discovered in bug #193947
 	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
@@ -79,10 +80,9 @@ ffmpeg/libavutil/bswap.h\
 ffmpeg/libswscale/yuv2rgb_template.c\
 src/export.h\
 src/message.cc\
-src/page_bttv.cc' po/POTFILES.in || die "sed failed"
+src/page_bttv.cc' po/POTFILES.in || die
 
-	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
-		src/filehandler.h || die "sed failed"
+	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' src/filehandler.h || die
 	epatch "${FILESDIR}/${P}-v4l1.patch"
 	epatch "${FILESDIR}/${P}-libav-0.7.patch"
 	epatch "${FILESDIR}/${P}-libav-0.8.patch"
@@ -90,16 +90,16 @@ src/page_bttv.cc' po/POTFILES.in || die "sed failed"
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--disable-local-ffmpeg \
 		$(use_enable quicktime) \
 		$(use_with sparc dv1394) \
+		--with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
 		CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
+	default
+	mv "${ED}/$(udev_get_udevdir)"/rules.d/{,99-}kino.rules
 	fowners root:root -R /usr/share/kino/help #177378
-	find "${ED}"usr -name '*.la' -exec rm -f {} + #385361
+	prune_libtool_files --all #385361
 }