commit:     c222c0d527ac8b70e3e8655ab2151c4959def484
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  8 20:30:14 2015 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Feb  8 20:30:14 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=c222c0d5

bump

Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A

---
 media-video/vdr/ChangeLog                    |   6 +
 media-video/vdr/Manifest                     |  14 +-
 media-video/vdr/files/vdr-2.1.9_gentoo.patch |  70 +++++++
 media-video/vdr/metadata.xml                 |   1 +
 media-video/vdr/vdr-2.1.9.ebuild             | 295 +++++++++++++++++++++++++++
 5 files changed, 381 insertions(+), 5 deletions(-)

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index e31d1a8..6c8deee 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-2.1.9 (08 Feb 2015)
+
+  08 Feb 2015; Joerg Bornkessel <[email protected]> +vdr-2.1.9.ebuild,
+  +files/vdr-2.1.9_gentoo.patch, metadata.xml:
+  bump
+
 *vdr-2.1.8-r2 (04 Feb 2015)
 
   04 Feb 2015; Joerg Bornkessel <[email protected]> -vdr-2.1.8-r1.ebuild,

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1b8ad2a..8dadc93 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -12,12 +12,14 @@ AUX vdr-2.1.6_gentoo.patch 2255 SHA256 
75ec762630d2e9099843151fd0b6e04c5b114faea
 AUX vdr-2.1.7_C++11.patch 4553 SHA256 
3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 
41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec
 WHIRLPOOL 
3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
 AUX vdr-2.1.7_gentoo.patch 2322 SHA256 
8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 
c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
 WHIRLPOOL 
88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
 AUX vdr-2.1.8_gentoo.patch 2322 SHA256 
8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 
c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
 WHIRLPOOL 
88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
+AUX vdr-2.1.9_gentoo.patch 2322 SHA256 
8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 
c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
 WHIRLPOOL 
88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
 DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 
42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 
07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8
 WHIRLPOOL 
c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
 DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 
c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 
a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a
 WHIRLPOOL 
9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
 DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 
6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 
22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1
 WHIRLPOOL 
b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
 DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 
eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 
cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813
 WHIRLPOOL 
ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
 DIST extpng-vdr-2.1.6-gentoo-edition-v2.patch.bz2 63143 SHA256 
df8d3b428bfdce7443c39029c11e66d9c328c13b0dc46163707e06238054be8b SHA512 
4ca1c6afc412decef231f0a1b8d0b64e4d38fc469cb3f15a301f24d613f4edfa32a8c12dff7b7ce562541f3b3d17561a4e0e7c0ae17c6dcc2d0a7090d73f9690
 WHIRLPOOL 
ef3d0b935e9dcc084e54d9e7548a863ece66f6ab60c1ec31c81dcb01bd7e84a532fb0313a9e9d6773a9d5e85fa25672e4c293c4b1df0a226e0eecbbbc4cfe053
 DIST extpng-vdr-2.1.8-gentoo-edition-v2.patch.bz2 29910 SHA256 
0e885f6b76bfe4246f14156810343afa441b09d205daad704962b3df4c976748 SHA512 
571976e0393cd84703a13b1236233af6f00e4f7fcaf5e93b017fafe84ab9dd09ea7c245aa6657ebebe8cafa35135c05821bab1f4093c687dc9cf61a5437c585f
 WHIRLPOOL 
3e9ca9d0974c9470f5358c7185d484bbdcc052ad6afe3b7cdb0789f86a4170dbdb830606ba3c53d85878e659289a43015487421b6978c81798f16b196c104b4f
+DIST extpng-vdr-2.1.9-gentoo-edition-v1.patch.bz2 26239 SHA256 
9a2f98de98af6f9954179aeae0848e0c183fe5d85e63652d7d2f859c49d0a77a SHA512 
6705a448810ee6061ce5009ff243a14c40ce9395f1d83b8223e1472c8481277abde3be900aca5b2a4291cb3f94c4f4fd58d326a88c7b12cf5493d558403ded87
 WHIRLPOOL 
91d45ed0a67e672886506843cf9dd933736ec46720641e9b9a692540aa5ef4dde2db50e1b636bfa7caf69ca53fd991de7d69bd2818e6f82aea4344666e96e98a
 DIST vdr-2.1.1.tar.bz2 842414 SHA256 
96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 
f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158
 WHIRLPOOL 
e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
 DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 
8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 
4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad
 WHIRLPOOL 
96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
 DIST vdr-2.1.2.tar.bz2 850237 SHA256 
1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 
4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5
 WHIRLPOOL 
525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
@@ -27,6 +29,7 @@ DIST vdr-2.1.5.tar.bz2 869767 SHA256 
e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc
 DIST vdr-2.1.6.tar.bz2 872380 SHA256 
232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 
ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df
 WHIRLPOOL 
df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
 DIST vdr-2.1.7.tar.bz2 880225 SHA256 
86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 
32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30
 WHIRLPOOL 
7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55
 DIST vdr-2.1.8.tar.bz2 890588 SHA256 
96d3209742e2b61d7e75ce54f767d61adc9857472f2c79df5479a4e60772975e SHA512 
f1b1d6261aabe8517a3e26a93244c4bc307289b41c033bedf7d25a468bb428a1a6f9a290fceccb9fa1cbf049a0eae7530902da1586143895457f2a997479b2d5
 WHIRLPOOL 
90c9a946ac43b66be01a9568b885b2162f01e7edf8665cde4c5c73b4c46750d67aed61cd383e33ba6e824b29212afe63b00c0f8a142c0c87b98507a370928663
+DIST vdr-2.1.9.tar.bz2 908415 SHA256 
324de39ea3d7e8366f21cf98cfa049772fcdaf69dbcb150cd491898d3f68e310 SHA512 
ee5abd9b98879b5dea84e439c57969316db92eb1729daac3f2258f38611d09dee49a43d59f9d01fb8af52dac569f9c611d18d8bd7e49ef3e65c22e599aae9c81
 WHIRLPOOL 
c6fe523248f70f06872745f4253b77b783e21d15ffe8f1bad3de166046f39c5cb75ada51eaea945687eba6b86e26f9e168137429d7dc4201347d035e08631ddb
 EBUILD vdr-2.1.1.ebuild 8500 SHA256 
dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 
fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6
 WHIRLPOOL 
ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
 EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 
9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 
6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84
 WHIRLPOOL 
ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
 EBUILD vdr-2.1.3.ebuild 7570 SHA256 
f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 
086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc
 WHIRLPOOL 
ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
@@ -38,13 +41,14 @@ EBUILD vdr-2.1.6.ebuild 7616 SHA256 
ca9c89b9db90646cfe89964f8f5094af9c8be19404ea
 EBUILD vdr-2.1.7.ebuild 7724 SHA256 
352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 
ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc
 WHIRLPOOL 
dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
 EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 
6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 
2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719
 WHIRLPOOL 
3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
 EBUILD vdr-2.1.8.ebuild 7624 SHA256 
ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 
ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7
 WHIRLPOOL 
d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-MISC ChangeLog 27290 SHA256 
5c4ac2d412830199894b2c074cf1eaa76ab7f9686587dcff2371f7583dc96c64 SHA512 
cc5adf3e114d777edf5fadd58de5af2d91844b6c3d6ee2732d52a68ad83c78b1c52f9f3e289b11b7ee3a826f6917d237a84dcc9fedd3ea3fb23d3d0ad325d0ea
 WHIRLPOOL 
2e6a7ecaafcbd40163f8b6f2a0509f12eecded4cc8121560836e2ceb0c0b91dddb5686866986ad83f3e557088e64399d799c9a7b5e76d95741146a52f6ee7385
-MISC metadata.xml 2071 SHA256 
d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 
cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56
 WHIRLPOOL 
e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
+EBUILD vdr-2.1.9.ebuild 7375 SHA256 
ec162ed5f246a0891074685395507c91e134f8a706ab625ef800b823670c5541 SHA512 
cddb1bb90e91c97fbd57cbd15b535b7289bef6a5b4521a72097b678f8d8063b586d56302d47da82882fd021031167ce61b11e36128657ba99f94edbaa3071c04
 WHIRLPOOL 
2b8cb039457773cc12cedca26ff3e9396e4de80b1802cea84bd715373cf525294a1fe18a3e46a2b5aa4786adf8d0450f520529653a486cf35555b597dbbc678f
+MISC ChangeLog 27445 SHA256 
22a496404d3b2ac829cf54c720faefa11ad85f2cbc31961a8e7548222bceea5f SHA512 
09b057429321f4492b47ae2e5fff4236f8cb5168f71ba9bf8bedee246162c192fa4fe3740de515ab34a211cea291bb37e5c615d558d15541b4c68d9f4969d8b5
 WHIRLPOOL 
ad80b1592b03c6880d8275ff7254db9f8e479ef0d844dec0454c236edd2c64df97e81682e492d961a1ab3274967eea5962989797ad8ca6dd5d1f529154306e07
+MISC metadata.xml 2138 SHA256 
f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 
d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb
 WHIRLPOOL 
cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by [email protected]
 
-iD8DBQFU0faCdn07HTTCgIoRCBAvAJ9H0paDU07ZQFUqmFDWR1+sEs86JgCgl3Ih
-NYBN0xIssvWa0A6N8TCSR/Y=
-=k3V2
+iD8DBQFU18dWdn07HTTCgIoRCNpKAJ4rpjNih8BMydM2k1lHOze/T1x/vwCbBCBJ
+cZYs8HgUNP3WDBYkpUavr5A=
+=cc9T
 -----END PGP SIGNATURE-----

diff --git a/media-video/vdr/files/vdr-2.1.9_gentoo.patch 
b/media-video/vdr/files/vdr-2.1.9_gentoo.patch
new file mode 100644
index 0000000..37ffd3c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.9_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile    2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' 
config.h)
+ 
+-all: vdr i18n plugins
++all: vdr i18n
+ 
+ # Implicit rules:
+ 
+@@ -170,7 +170,7 @@
+ 
+ PODIR     = po
+ LOCALEDIR = locale
+-I18Npo    = $(wildcard $(PODIR)/*.po)
++I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, 
$(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot   = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+ 
+ install-i18n: i18n
+       @mkdir -p $(DESTDIR)$(LOCDIR)
+-      cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++      @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] 
&& continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+ 
+ # The 'include' directory (for plugins):
+ 
+@@ -255,7 +255,7 @@
+ 
+ # Install the files (note that 'install-pc' must be first!):
+ 
+-install: install-pc install-bin install-dirs install-conf install-doc 
install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc 
install-i18n install-includes
+ 
+ # VDR binary:
+ 
+@@ -267,12 +267,13 @@
+ 
+ install-dirs:
+       @mkdir -p $(DESTDIR)$(VIDEODIR)
+-      @mkdir -p $(DESTDIR)$(CONFDIR)
+-      @mkdir -p $(DESTDIR)$(ARGSDIR)
+-      @mkdir -p $(DESTDIR)$(CACHEDIR)
++#     @mkdir -p $(DESTDIR)$(CONFDIR)
++#     @mkdir -p $(DESTDIR)$(ARGSDIR)
++#     @mkdir -p $(DESTDIR)$(CACHEDIR)
+       @mkdir -p $(DESTDIR)$(RESDIR)
+ 
+ install-conf:
++      @mkdir -p $(DESTDIR)$(CONFDIR)
+       @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+ 
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+ 
+ install-includes: include-dir
+-      @mkdir -p $(DESTDIR)$(INCDIR)
+-      @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++#     @mkdir -p $(DESTDIR)$(INCDIR)
++#     @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++      @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++      @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++      @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+ 
+ # pkg-config file:
+ 

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 9a90cac..8bd1561 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -17,6 +17,7 @@
                <flag name="html">Install HTML documentation</flag>
                <flag name="jumpplay">Enables automatic jumping over cut marks 
while watching a recording</flag>
                <flag name="jumpingseconds">skip seconds in played 
records</flag>
+               <flag name="kbd">enable keyboard support as remote device</flag>
                <flag name="mainmenuhooks">Allows to replace main menu entries 
by some special plugins (like epgsearch, extrecmenu, ...)</flag>
                <flag name="menuorg">Enables support for the 
menuorg-plugin</flag>
                <flag name="menuselection">adds support for menu hotkeys of 
double digits</flag>

diff --git a/media-video/vdr/vdr-2.1.9.ebuild b/media-video/vdr/vdr-2.1.9.ebuild
new file mode 100644
index 0000000..623b95f
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.9.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 
2013/07/07 09:52:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin 
+                               mainmenuhooks menuorg menuselection resumereset 
ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
+
+IUSE="bidi debug kbd html systemd vanilla ${EXT_PATCH_FLAGS} 
${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for 
DVB"
+HOMEPAGE="http://www.tvdr.de/";
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+       http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2";
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg
+       sys-libs/libcap
+       >=media-libs/fontconfig-2.4.2
+       >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+       >=virtual/linuxtv-dvb-headers-5.3
+       sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+       dev-lang/perl
+       >=media-tv/gentoo-vdr-scripts-2.5_rc1
+       media-fonts/corefonts
+       bidi? ( dev-libs/fribidi )
+       systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+       use debug && append-flags -g
+
+       PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+       tc-export CC CXX AR
+}
+
+add_cap() {
+       local arg
+       for arg; do
+               CAPS="${CAPS}\n${arg}=1"
+       done
+}
+
+enable_patch() {
+       local arg ARG_UPPER
+       for arg; do
+               ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+               echo "${ARG_UPPER} = 1" >> Make.config
+
+               # codesnippet to bring the extpng defines into the vdr.pc 
CXXFLAGS CFLAGS
+               echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+               cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+               export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+       done
+}
+
+extensions_add_make_conf()
+{
+       # copy all ifdef for extensions-patch to Make.config
+       sed -e '1,/need to touch the following:/d' \
+               -e '/need to touch the following/,/^$/d' \
+               Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+       # extract all possible settings for extensions-patch
+       sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+               Make.config.template \
+               | sort \
+               | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+       LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' 
)
+}
+
+src_prepare() {
+       # apply maintainace-patches
+       ebegin "Changing paths for gentoo"
+
+       local DVBDIR=/usr/include
+       local i
+       for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+               [[ -d ${i} ]] || continue
+               if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+                       einfo "Found DVB header files in ${i}"
+                       DVBDIR=${i}
+                       break
+               fi
+       done
+
+       # checking for s2api headers
+       local api_version
+       api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' 
"${DVBDIR}"/linux/dvb/version.h)
+       api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / 
{print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+       if [[ ${api_version:-0} -lt 5*3 ]]; then
+               eerror "DVB header files do not contain s2api support or too 
old for ${P}"
+               eerror "You cannot compile VDR against old dvb-header"
+               die "DVB headers too old"
+       fi
+
+       cat > Make.config <<-EOT
+               #
+               # Generated by ebuild ${PF}
+               #
+               PREFIX                  = /usr
+               DVBDIR                  = ${DVBDIR}
+               PLUGINLIBDIR    = ${PLUGIN_LIBDIR}
+               CONFDIR                 = ${CONF_DIR}
+               VIDEODIR                = /var/vdr/video
+               LOCDIR                  = \$(PREFIX)/share/locale
+               INCDIR                  = \$(PREFIX)/include
+
+               DEFINES                 += -DCONFDIR=\"\$(CONFDIR)\"
+               INCLUDES                += -I\$(DVBDIR)
+
+               # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+               # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile 
new)
+               LIBDIR                  = ${PLUGIN_LIBDIR}
+               PCDIR                   = /usr/$(get_libdir)/pkgconfig
+
+               #BIDI = 1
+               #SDNOTIFY = 1
+               NO_KBD = 1
+       EOT
+       eend 0
+
+       # support languages, written from right to left
+       if use bidi; then
+               sed -e "s:#BIDI = 1:BIDI = 1:" -i Make.config
+       fi
+
+       # systemd notification support
+       if use systemd; then
+               sed -e "s:#SDNOTIFY = 1:SDNOTIFY = 1:" -i Make.config
+       fi
+
+       # with/witout keyboard
+       if use kbd; then
+               sed -e "s:NO_KBD = 1:#NO_KBD = 1:" -i Make.config
+       fi
+
+       if ! use vanilla; then
+
+               # Now apply extensions patch
+               epatch "${WORKDIR}/${EXT_P}.patch"
+
+               # This allows us to start even if some plugin does not exist
+               # or is not loadable.
+               enable_patch PLUGINMISSING
+
+               if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+                       einfo "Doing maintainer checks:"
+
+                       # we do not support these patches
+                       # (or have them already hard enabled)
+                       local IGNORE_PATCHES="pluginmissing"
+
+                       extensions_all_defines > "${T}"/new.IUSE
+                       echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME 
\
+                                       $IGNORE_PATCHES | \
+                               tr ' ' '\n' |sort > "${T}"/old.IUSE
+                       local DIFFS=$(diff -u "${T}"/old.IUSE 
"${T}"/new.IUSE|grep '^[+-][^+-]')
+                       if [[ -z ${DIFFS} ]]; then
+                               einfo "EXT_PATCH_FLAGS is up to date."
+                       else
+                               ewarn "IUSE differences!"
+                               local diff
+                               for diff in $DIFFS; do
+                                       ewarn "$diff"
+                               done
+                       fi
+               fi
+
+               ebegin "Enabling selected patches"
+               local flag
+               for flag in $EXT_PATCH_FLAGS; do
+                       use $flag && enable_patch ${flag}
+               done
+
+               eend 0
+
+               extensions_add_make_conf
+
+               # add defined use-flags compile options to vdr.pc
+               sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) 
\$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+                       -i Makefile
+
+               ebegin "Make depend"
+               emake .dependencies >/dev/null
+               eend $? "make depend failed"
+       fi
+
+       epatch "${FILESDIR}/${P}_gentoo.patch"
+
+       epatch_user
+
+       add_cap CAP_UTF8
+
+       add_cap CAP_IRCTRL_RUNTIME_PARAM \
+                       CAP_VFAT_RUNTIME_PARAM \
+                       CAP_CHUID \
+                       CAP_SHUTDOWN_AUTO_RETRY
+
+       echo -e ${CAPS} > "${CAP_FILE}"
+
+       # LINGUAS support
+       einfo "\n \t VDR supports the LINGUAS values"
+
+       lang_po
+
+       einfo "\t Please set one of this values in your sytem make.conf"
+       einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+       if [[ -z ${LINGUAS} ]]; then
+               einfo "\n \t No values in LINGUAS="
+               einfo "\t You will get only english text on OSD \n"
+       fi
+
+       strip-linguas ${LING_PO} en
+}
+
+src_install() {
+       # trick makefile not to create a videodir by supplying it with an 
existing
+       # directory
+       emake \
+       VIDEODIR="/" \
+       DESTDIR="${D}" install || die "emake install failed"
+
+       keepdir "${PLUGIN_LIBDIR}"
+
+       # backup for plugins they don't be able to create this dir
+       keepdir "${CONF_DIR}"/plugins
+
+       if use html; then
+               dohtml *.html
+       fi
+
+       dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+       insinto /usr/share/vdr
+       doins "${CAP_FILE}"
+
+       if use alternatechannel; then
+               insinto /etc/vdr
+               doins "${FILESDIR}"/channel_alternative.conf
+       fi
+
+       chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+
+#      elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
+#      elog "\tA lot of thanks to Klaus Schmiedinger"
+#      elog "\tfor this nice piece of Software...\n"
+
+       elog "It is a good idea to run vdrplugin-rebuild now."
+
+       elog "To get nice symbols in OSD we recommend to install"
+       elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+       elog "\t2. select font VDRSymbolsSans in Setup"
+       elog ""
+       elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+       elog "\thttps://wiki.gentoo.org/wiki/VDR";
+}

Reply via email to