bump, vdr-plugin-2.eclass, some minor fixes

Package-Manager: portage-2.1.11.9/cvs/Linux i686

6 files changed, 352 insertions, 22 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 67268bbf515a..8d0fc71258c1 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.30 2012/04/07 01:36:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.31 2012/10/20 17:46:20 hd_brummy Exp $
+
+*vdr-graphtft-0.3.6 (20 Oct 2012)
+
+  20 Oct 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-graphtft-0.3.6.ebuild, +files/vdr-graphtft-0.3.6_gcc-4.4.x.diff,
+  +files/vdr-graphtft-0.3.6_gentoo.diff,
+  +files/vdr-graphtft-0.3.6_makefile.diff:
+  bump, vdr-plugin-2.eclass, some minor fixes
 
   07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-graphtft-0.3.4.ebuild, +files/vdr-1.7.27.diff:
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 46af181bc027..bf7049d8c137 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -1,28 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
-AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
-AUX rc-addon.sh 347 RMD160 2590e2083dd556b00d528643829a4bd16cb4eacd SHA1 f3d7599243ac5d468cf1c81a6391b16570f841e7 SHA256 9e0842f058670bfc5af58e2f12a334b31e7741cd3e2f3fb6d1cb5ae8475c3efe
-AUX vdr-1.7.27.diff 2645 RMD160 40aef6e28a397f6f7052f8148ca57865c3a4dde0 SHA1 330380126e0739e7d40585bd76588f87afb1d947 SHA256 96ea5e85342cebcbc98551b766fc02e8b351b616e52f4d1a565e19bac84ce514
-AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 RMD160 6bf209fc3ecdfbd0e398162b1e7cfeebb926ce4a SHA1 bb9e3c0200a9d120846869b57714941fb498ec01 SHA256 5d5274914de62d77ff4fcf5f32a6b12c74be721ce986cd17074c6e1a7947339b
-AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 RMD160 c87cb78c744955797231588b49dd883f4a8916b7 SHA1 74add8c610f22cdd91c8521fc26e4e42af4f0b86 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864
-AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 RMD160 57ecff3f499eabf828fe5187238325b43e165eea SHA1 55dad00159b65690220bd337716b4a6a47ca3412 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68
-AUX vdr-graphtft-0.3.2.24_makefile.diff 2202 RMD160 9c89b2c4a1a6f1511e8185c9b3e8c771aea294d6 SHA1 a191da00e9a9cea2fb0043e55039e88987ea27f5 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0
-AUX vdr-graphtft-0.3.4_gcc-4.4.x.diff 764 RMD160 b5b9a73d3842519969b6b53b758913e29264daf5 SHA1 4679f1f217c2296070f8d35e9bbad6877b7f9ac8 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545
-AUX vdr-graphtft-0.3.4_gentoo.diff 4673 RMD160 3446e817f5c38555c46eac0c6103574582249b17 SHA1 103e2bc970f3c2637f36f9d82429b6b3e524c14f SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0
-AUX vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch 1478 RMD160 451fc490e1f8163d9da96290fa9c954f5b6cf68b SHA1 249d8f6cf86c7a4ef5d171bd7c33a7dfbd5bcb49 SHA256 c3b8d97bfe7497ba73602009640624f2be573f159b913ad238ada0b3aff4a48c
-DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 RMD160 2c767a7bf0cfa76592499953fe22141073e653ac SHA1 cc80e8b86865ec2547ad8103cac03d4ac7840a9b SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
-DIST vdr-graphtft-0.3.4.tar.gz 176477 RMD160 5dcb4d6890cb6e7262dafc2a44a2b33db926d0e8 SHA1 d05647f1256ec07047507fba15645374c3bde06a SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313
-EBUILD vdr-graphtft-0.3.2.24.ebuild 2383 RMD160 cd7af4a1638b60a81ea5c1504c637de64c60220e SHA1 4dfdd4d1e681fd0cea6b71b1a39304c58ef91dc8 SHA256 68ec5c3af45e9065fe3958051f31a12a410858350dcf8ffb96331b95425590cf
-EBUILD vdr-graphtft-0.3.4.ebuild 2479 RMD160 14f865f2200d4afcc30312a7a2a15ce7375e1931 SHA1 18412b4c1f63e727b7ad854bae781ba884cad24b SHA256 e6454f53a823b3bd12419ef839fdd3e0aaf8777918c8bd66ca5ff4c0a1a1a585
-MISC ChangeLog 6959 RMD160 0e3b7560e338698da92789bcbc30d65c6cd24583 SHA1 630f720a3a48b9a58a15570aae6d38c651d44eb1 SHA256 0ea8b257c02a2ef3491733f82499c1359c63474b570ed7adc0d03bdcd37f754e
-MISC metadata.xml 659 RMD160 3fd53b58573a60e87e1f2d78f0ec7de700121244 SHA1 85ba547e5e7cf18e3554b372b9c5ffa1e94c2002 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb
+AUX confd 1233 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063 SHA512 b2423ebac8b00345cc78c617970413cbe9c0cd7b66f21d23e2e9aafa72fb6ecf97e94d7fbf76fe7d52e9efce8c51f7082fc3dcbd50d53b8631dd47cb66aee526 WHIRLPOOL 3ba68926ba59d59776a12e83cb7e75963c6eb692828676fa7cba04d339754ab077b7c9edf25b401b88832bc09f1237e2ec1b74367131b9acae23f540d89014d6
+AUX graphtft-fe 995 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107 SHA512 ea40c2aa8b8f084dd7f195585afbdd038c0d5d1078b305626022ff249141c17ca383139120ed38b7f2bf28c54a4b149573ccf190033ea77c374dd7ea6cc0f85c WHIRLPOOL e7e9648aa4ab90f922e6a829fc1a3d2cdd735a2318363ff0026e498d564a69cb30157ca38e1ca253df3074fe721ebf0bf57a7bf9bba3e0112e971fe9cc15022a
+AUX rc-addon.sh 347 SHA256 9e0842f058670bfc5af58e2f12a334b31e7741cd3e2f3fb6d1cb5ae8475c3efe SHA512 283877d8961d063c0fd1176078fb249d34dcac46eaa249cbabaa46afc0fe34d2bbc9459c941f32af815de2e2959408d00e8e17bf09d9396f0183fb67450b2138 WHIRLPOOL 7393e9ab4acec65038c2a7120f6d7a0756a83eba5aa154203c8bacb87685170e94d787dd02490addf4c15fbc3d667bd0b89d2c4e06e833cc9a1730890c2b61d0
+AUX vdr-1.7.27.diff 2645 SHA256 96ea5e85342cebcbc98551b766fc02e8b351b616e52f4d1a565e19bac84ce514 SHA512 455f816d9072466b08699c668bbad9170332c3b404d91dc0544b2afc5833785e6c9b37c2ea79f797223e406a1cd210f4a74575bc178b1c902ccc625eeabb6f79 WHIRLPOOL 5528afeab3b6501d6a9e112e4d8ff946b06253b891da01f4a21bd5c799f172527dcf377fbdcfb131a38a92a64f32cf6641c4a9c3988cab9b7332b5ac4117ff0b
+AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 SHA256 5d5274914de62d77ff4fcf5f32a6b12c74be721ce986cd17074c6e1a7947339b SHA512 fc616a7c0239b2caac02256de8a98f9e76dfd8d9ff984be10d531c618e7d75ba67624ad8804ee536e1e1f8f26d35a080887835c902d62f925338addfb9deaafe WHIRLPOOL e4823f21408e10ff151936d4edee6df078a61785508e90d5c8c8af037ae524133d0ad57b6b6ba6779113e89230ddb3102aea4994bbe527d82226a5e154183184
+AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864 SHA512 28a73eda7024573a0e317b300b83c96be3fa5d791979d0ba69e89829c5b6a795b6d9ff54b87c3100ac784b83d456714147da256e8bce5cf58ea0d8ae0b09a540 WHIRLPOOL 179f1aea80df6a7493a4da8b847f0decbcfcb402e89ae6a2bc6a547507d65827105bafd2864513377578ef19f0196b05759867851ad98b80f65447f7094071ae
+AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68 SHA512 ec5867e7e2f1a6cb699b53b2c31918e44b06c999fd1a174a6572a8eac0fb53b89997fde76ec8b2ca4b347ff9a0d5b85d7dd186b25d3544b1555014abd3dbe5c5 WHIRLPOOL bc2f621aef43c50a661223970f9eb81bea22e374bd2e37cb9f2bffa4c7c2560788bddeb8c9cd4490080554d86f8c4f02506b8543aa8f6883b65ada5893dd9091
+AUX vdr-graphtft-0.3.2.24_makefile.diff 2202 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0 SHA512 9c8138658a18162436cf80173436c05967c4626decb640d0c304706e30b7771d1784b436dbf281ca934c7fe41b8b1edc102d05bd3d2ddd3875aefe5c33bc2ece WHIRLPOOL 97f8561a1367ce51a8be6ac9b17c1fae391c39f4f24acd9f6d60a966872df3d0155fdf5552f90b8be63a25ab6d9c370011b13f51b752ea4ba07ae55b834511a3
+AUX vdr-graphtft-0.3.4_gcc-4.4.x.diff 764 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545 SHA512 bff4b655a4eeee4c4ecdf0f5e4efc259bd2e740a4ee64b8536ad668b2e1be5b607279173c01b1dc36a0636011d0d774fd3b3f28a40efa779efb342ef2c081619 WHIRLPOOL 341838fdbf4519a14a7315249669f20bb02acd0a13633a0fdb7b27f5f14cac40c8bdc42658d2f6be0747ecc0ba12ee659bc4d6cc9d9f07f27e502df099f0471e
+AUX vdr-graphtft-0.3.4_gentoo.diff 4673 SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0 SHA512 1828a1e463eef00eb0097188988b8ab620c766b27c44fbfedbd4209d1c668b6c6e6b0b86c4d16c485fdc5e16300e2c03c323f6dc2e941c9338e5a866b6d47a6a WHIRLPOOL fb89ee44a3bd2ca116da5b58d4fdd8614b995b8e0dde58d8fc4c76010cd0cab24757dfbd387d607d4e731da0213608b1cfbf02e8d6d03b3a4cb3568fda44f046
+AUX vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch 1478 SHA256 c3b8d97bfe7497ba73602009640624f2be573f159b913ad238ada0b3aff4a48c SHA512 3db33a9302b12b05c42509da11a8ad05c31af4ded965f31c62494217220a3c99ad266788d5ffc33a24d196a9b1ecaef7ad7ef184110804ab3963f89578c5c598 WHIRLPOOL 7f6b966c854aa31f209084b070b5229aeb43f3fc6ed22ddd217d17606e6dab50fdeaa96947443fca785170bc4bbd4a2c0d0b526148f3acd8a9f7cf6671a25538
+AUX vdr-graphtft-0.3.6_gcc-4.4.x.diff 764 SHA256 eef74d7d0c866aa22f2755ba850d2b2f5fb6739f7d9d1a09850dedc324948545 SHA512 bff4b655a4eeee4c4ecdf0f5e4efc259bd2e740a4ee64b8536ad668b2e1be5b607279173c01b1dc36a0636011d0d774fd3b3f28a40efa779efb342ef2c081619 WHIRLPOOL 341838fdbf4519a14a7315249669f20bb02acd0a13633a0fdb7b27f5f14cac40c8bdc42658d2f6be0747ecc0ba12ee659bc4d6cc9d9f07f27e502df099f0471e
+AUX vdr-graphtft-0.3.6_gentoo.diff 4673 SHA256 a4da681ef44faa45cb6a4b5657443dee90a6f0707fd9d263c2062e5ba4f266b0 SHA512 1828a1e463eef00eb0097188988b8ab620c766b27c44fbfedbd4209d1c668b6c6e6b0b86c4d16c485fdc5e16300e2c03c323f6dc2e941c9338e5a866b6d47a6a WHIRLPOOL fb89ee44a3bd2ca116da5b58d4fdd8614b995b8e0dde58d8fc4c76010cd0cab24757dfbd387d607d4e731da0213608b1cfbf02e8d6d03b3a4cb3568fda44f046
+AUX vdr-graphtft-0.3.6_makefile.diff 2202 SHA256 76ea0ceb3967c9c83a299c4231147c57dd1be40cfd390f60456b13ebe56912d0 SHA512 9c8138658a18162436cf80173436c05967c4626decb640d0c304706e30b7771d1784b436dbf281ca934c7fe41b8b1edc102d05bd3d2ddd3875aefe5c33bc2ece WHIRLPOOL 97f8561a1367ce51a8be6ac9b17c1fae391c39f4f24acd9f6d60a966872df3d0155fdf5552f90b8be63a25ab6d9c370011b13f51b752ea4ba07ae55b834511a3
+DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
+DIST vdr-graphtft-0.3.4.tar.gz 176477 SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313 SHA512 37621b0a6ab846d4c823b7d1f13d1b4f3f5181d5949da968086d471e1a877d1b737242e1adee5c290424eb1100db9ebf260a76e7f41080f359a561d800af6f01 WHIRLPOOL 1c7cdd8358124f1c920da0261d79269240393ebb9b61d50e0cc99c37a220389971c7965cafd4191e3221c7dc56aef382537c5a61464c3ce2d879a87ec476528d
+DIST vdr-graphtft-0.3.6.tar.bz2 153320 SHA256 43d2b7579e90ef69c451d10b70f57a71a3ef6c13d894258981f785049392c4fc SHA512 0409b9cc62747bebcbe056afc1d632e6c5a4d11cec691a63154bb3ddfd506502577c76fda797a3b707b5f4285e0da604164dff14f782f25800bc8562736ac3b2 WHIRLPOOL a45c86445435a069753de0e5471781344f7aa8aaa61975f0c3b27c8bb05970bc55cd7e6ec1ea45810ffbbdc6f45eaa2a503ce808d620003847014e8cc6d2a8f0
+EBUILD vdr-graphtft-0.3.2.24.ebuild 2383 SHA256 68ec5c3af45e9065fe3958051f31a12a410858350dcf8ffb96331b95425590cf SHA512 0b45a87460e362af461f8395358b2fc6ece1f07528f88b604e9cb1c2a959a68f3c556b80c40cfe0460b9f2c9747e6863f5aa72ab8be9876c2b03da77a6c81623 WHIRLPOOL e3a0b436aa3e0fd6f52d38a8f1714524143b96bef3677a523eb0a7a7b7b84dfa659f2c916c00b3fa78109f1d937b58811f1bd47e805360d14c57edff15b2fb94
+EBUILD vdr-graphtft-0.3.4.ebuild 2479 SHA256 e6454f53a823b3bd12419ef839fdd3e0aaf8777918c8bd66ca5ff4c0a1a1a585 SHA512 6e11482e7b13d404d8c13422296566bd357d0f2f005103900b34d6f3a26011e82690876418060129a365bbb25059b2a8464df2fce6ee1cbaa71ec51b20bc4630 WHIRLPOOL c2953aefef6f592190253fb6a40d51b5efaebf0571440af2ed2d30f6ad0fc4b26cc63d4d1d17f83a8b06fbf00eea0c6456c966398fee31dba25b1a80f3e66643
+EBUILD vdr-graphtft-0.3.6.ebuild 2197 SHA256 ac377eb244ec253ab3f4303a26968c4a4d9c8290e29fcf1fb291d9ab0bb20677 SHA512 ff259d683308b2fbc7ab48fb4f9225060899adbefac383546ac582b506f058e459edc36dd068157d552d6ce767b138d87cfd11c0578f0d38925fe7578d8e5286 WHIRLPOOL eda7290c5e657c2b308565e3cd4bbc1c307e21e857a436565197f1f94d52625039a11928f4584e4d39fa4110295598df07495cbdf988522b57e38d8b6d82c728
+MISC ChangeLog 7252 SHA256 60be6c43b4c3d6f53c81ab12aa28a77eda827fe3a6f9c73afb634bc144f8591a SHA512 82757f31da45df17243b9af9ea20eba52b2475a16751bd834c696915d73d2c3def5a0bb145c4a775642fe54c7ecad764fef2e4316d4a895428e3c43c043e6ee4 WHIRLPOOL d6df5735080996f4dc7e252b7701f9067dd7c01e8e78c3cb619566ee388e9606814a479a33065a84fe3149dbf9acf14fb16c95faa32bad25b826ecf5941d0476
+MISC metadata.xml 659 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb SHA512 409b810a9cd79f1fad18e02a01638180cdab8ea15297aef83cefe21fdb4ffdf263162d13abec47890034410b64991e190edbbeb114ef429b371ec9db829d8749 WHIRLPOOL 270ca6768ffb51dba563da5b134ec126192d272e55441d3ad200a0b7acbf3fd71708a68ecfb24702f93ef2a24a7aa14eb2402c65475d7b46056ee27d1b62b2d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPf5tJdn07HTTCgIoRAue6AJ4hqcAwz+M9LHqoqYrAlGEpOWCfeACeOYwX
-F1dTDNKM1rv9gk3cwGl4YzE=
-=awin
+iD8DBQFQguNydn07HTTCgIoRCIX7AKC3zTbau0eycXYpX1oWw07hrB9RkgCgu23W
+f994MPr41xl9IfOzkz4fv10=
+=BMO/
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff
new file mode 100644
index 000000000000..4e32c187ac10
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gcc-4.4.x.diff
@@ -0,0 +1,22 @@
+diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
+--- graphtft-30.orig/graphtft-fe/common.cc	2012-03-12 02:10:38.000000000 +0100
++++ graphtft-30/graphtft-fe/common.cc	2012-03-12 02:30:16.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include <time.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #include <graphtft.hpp>
+ 
+diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
+--- graphtft-30.orig/graphtft-fe/graphtft.hpp	2012-03-12 02:10:38.000000000 +0100
++++ graphtft-30/graphtft-fe/graphtft.hpp	2012-03-12 02:30:57.000000000 +0100
+@@ -16,6 +16,7 @@
+ #include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #define __FRONTEND
+ #include <../common.h>
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff
new file mode 100644
index 000000000000..ea0e7ad3d748
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_gentoo.diff
@@ -0,0 +1,139 @@
+diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
+--- graphtft-30.orig/dfbrenderer/dfbrenderer.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/dfbrenderer/dfbrenderer.c	2012-03-12 03:29:35.000000000 +0100
+@@ -257,7 +257,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -281,7 +281,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    fontPaths[count] = path;
+    free(path);
+@@ -483,7 +483,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s", fpath);
+@@ -561,7 +561,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s", fpath);
+diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
+--- graphtft-30.orig/dspitems.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/dspitems.c	2012-03-12 03:30:16.000000000 +0100
+@@ -107,7 +107,7 @@
+       if (p[0] != '/')
+       {
+          p = string(GraphTFTSetup.PluginConfPath) 
+-            + "/graphTFT/themes/" 
++            + "/themes/" 
+             + string(Thms::theTheme->getDir()) 
+             + "/" + p;
+       }
+diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
+--- graphtft-30.orig/graphtft.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/graphtft.c	2012-03-12 03:32:48.000000000 +0100
+@@ -22,6 +22,8 @@
+ #include <graphtft.h>
+ #include <span.h>
+ 
++#define DATA_DIR "/usr/share/vdr/graphTFT"
++
+ //***************************************************************************
+ // cGraphTFTMenu
+ //***************************************************************************
+@@ -300,13 +302,13 @@
+ 
+    // try to get the config dir
+ 
+-   if (!ConfigDirectory())
+-      return false;
++//   if (!ConfigDirectory())
++//      return false;
+ 
+    // init 
+ 
+    GraphTFTSetup.setClient(this);
+-   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
++   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
+ 
+ #if APIVERSNUM < 10507
+    RegisterI18n(Phrases);
+@@ -322,7 +324,7 @@
+    if (loadThemes() != 0)
+       return false;
+ 
+-   if (display->Init(_dev, ConfigDirectory(), port) != success)
++   if (display->Init(_dev, DATA_DIR, port) != success)
+    {
+       tell(0, "Error: Initializing graphTFT device faild, aborting!");
+ 
+@@ -355,8 +357,8 @@
+ 
+    // look for the themes in the config directory
+ 
+-   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
+-            ConfigDirectory());
++   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
++            DATA_DIR);
+ 
+    p = popen(buffer, "r");
+ 
+diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
+--- graphtft-30.orig/imlibrenderer/imlibrenderer.c	2012-03-12 03:27:38.000000000 +0100
++++ graphtft-30/imlibrenderer/imlibrenderer.c	2012-03-12 03:33:54.000000000 +0100
+@@ -123,7 +123,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -146,7 +146,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    imlib_add_path_to_font_path(path);
+    free(path);
+@@ -217,7 +217,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
+@@ -291,7 +291,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff
new file mode 100644
index 000000000000..f638be630069
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.6_makefile.diff
@@ -0,0 +1,67 @@
+Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009
+Matthias Schwarzott <zzam@g.o> 23 Okt 2009
+diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile
+--- graphtft-24.orig/Makefile	2009-10-21 21:53:56.000000000 +0200
++++ graphtft-24/Makefile	2009-10-21 21:57:24.000000000 +0200
+@@ -158,10 +158,10 @@
+ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+ 
+ ifdef HAVE_IMLIB
+-  LIBS += `imlib2-config --libs`
++  LIBS += $(shell imlib2-config --libs)
+ 
+   ifdef HAVE_IMAGE_MAGICK
+-    LIBS += `Magick++-config --libs`
++    LIBS += $(shell Magick++-config --libs)
+     DEFINES += -DHAVE_IMAGE_MAGICK
+   endif
+ 
+@@ -170,8 +170,8 @@
+ endif
+ 
+ ifdef HAVE_GTOP
+-  GTOP_INC = `pkg-config libgtop-2.0 --cflags`
+-  GTOP_LIB = `pkg-config libgtop-2.0 --libs`
++  GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags)
++  GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs)
+ 
+   DEFINES += -DWITH_SYSINFO
+   LIBS += $(GTOP_LIB)
+@@ -186,8 +186,8 @@
+ endif
+ 
+ ifdef HAVE_DFB
+-  INCLUDES += `directfb-config --cflags`
+-  LIBS += `directfb-config --libs`
++  INCLUDES += $(shell directfb-config --cflags)
++  LIBS += $(shell directfb-config --libs)
+   DEFINES += -DHAVE_DFB
+ endif
+ 
+diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
+--- graphtft-24.orig/graphtft-fe/Makefile	2009-10-22 17:39:55.000000000 +0200
++++ graphtft-24/graphtft-fe/Makefile	2009-10-22 17:41:29.000000000 +0200
+@@ -1,9 +1,9 @@
+ 
+ CXX           = g++
+ CXXFLAGS      = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC
+-INCPATH       = -I. `Magick++-config --cppflags`
++INCPATH       = -I. $(shell Magick++-config --cppflags)
+ LFLAGS        = -Wl,--no-undefined
+-LIBS          = -lpthread `imlib2-config --libs` `Magick++-config --libs`
++LIBS          = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs)
+ AR            = ar
+ 
+ TARGET = graphtft-fe
+diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
+--- graphtft-24.orig/graphtft-fe/Makefile	2009-10-23 16:20:43.000000000 +0200
++++ graphtft-24/graphtft-fe/Makefile	2009-10-23 16:21:20.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ all: 
+ 	echo Build graphTFT Frontend
+-	@(make $(TARGET))
++	@$(MAKE) $(TARGET)
+ 
+ 
+ $(TARGET): $(OBJECTS)
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild
new file mode 100644
index 000000000000..4f0c4e47c1c2
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.6.ebuild,v 1.1 2012/10/20 17:46:20 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2 flag-o-matic
+
+RESTRICT="test"
+
+DESCRIPTION="VDR plugin: GraphTFT"
+HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
+SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
+IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
+
+DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
+		media-libs/imlib2[png,jpeg]
+		gnome-base/libgtop
+		>=virtual/ffmpeg-0.4.8_p20090201
+		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
+		directfb? ( dev-libs/DirectFB )
+		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
+		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
+		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
+		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
+
+PATCHES=("${FILESDIR}/${P}_gentoo.diff"
+		"${FILESDIR}/${P}_makefile.diff"
+		"${FILESDIR}/${P}_gcc-4.4.x.diff")
+
+src_prepare() {
+
+	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
+
+	! use touchscreen && sed -i Makefile  \
+		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
+
+	use graphtft-fe && sed -i Makefile \
+		-e "s:#WITH_X_COMM:WITH_X_COMM:"
+
+	vdr-plugin-2_src_prepare
+
+	remove_i18n_include graphtft.h setup.h
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_compile() {
+	vdr-plugin-2_src_compile
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe
+		emake
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe && dobin graphtft-fe
+		doinit graphtft-fe
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if use graphtft-fe; then
+		echo
+		elog "Graphtft-fe user:"
+		elog "Edit /etc/conf.d/vdr.graphtft"
+		elog "/etc/init.d/graphtft-fe start"
+		echo
+	fi
+}