diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-05-01 15:54:07 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-05-01 15:54:07 +0000 |
commit | 6382ab2ee2e0e66e8da6e5189f1780947241fd3c (patch) | |
tree | b95ada90cba09c63fd8a709e49ac9cc05d16ec05 /media-plugins | |
parent | fix echangelog-user (diff) | |
download | historical-6382ab2ee2e0e66e8da6e5189f1780947241fd3c.tar.gz historical-6382ab2ee2e0e66e8da6e5189f1780947241fd3c.tar.bz2 historical-6382ab2ee2e0e66e8da6e5189f1780947241fd3c.zip |
cleanup; vdr-plugin-2.eclass; removed use-flag nls
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'media-plugins')
7 files changed, 24 insertions, 191 deletions
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog index d88d28ef5907..973fde6dac89 100644 --- a/media-plugins/vdr-text2skin/ChangeLog +++ b/media-plugins/vdr-text2skin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-text2skin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.13 2012/04/07 19:08:48 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.14 2012/05/01 15:54:07 hd_brummy Exp $ + + 01 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> + -vdr-text2skin-1.2.ebuild, -vdr-text2skin-1.3.ebuild, + -vdr-text2skin-1.3.1.ebuild, vdr-text2skin-1.3.2.ebuild, + files/vdr-text2skin-1.3.2-Makefile.patch: + cleanup; vdr-plugin-2.eclass; removed use-flag nls 07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-text2skin-1.3.2.ebuild, +files/vdr-1.7.27.diff: diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest index b85bae42c2bc..489625bb6647 100644 --- a/media-plugins/vdr-text2skin/Manifest +++ b/media-plugins/vdr-text2skin/Manifest @@ -2,22 +2,16 @@ Hash: SHA1 AUX vdr-1.7.27.diff 3814 RMD160 7059d2ca2c92af647f118d015b4d87ebd8f21e73 SHA1 28346eb074beea390a525de61bb011cccc9121e9 SHA256 75909234a38c12b0bdee6be17768644316a605991cd1aa1227ea8e4b41a7faba -AUX vdr-text2skin-1.3.2-Makefile.patch 1836 RMD160 6cb2f4541334179be0edb2bdb44a46effd0d7e57 SHA1 5cbdee622aad43a119effa4a8b98edf851a47d0c SHA256 8446a7e344b855dae3dde6a8dc0e2997a204b0721eb6b232634654d1c6ce2ec3 -DIST vdr-text2skin-1.2.tgz 77391 RMD160 0b1ff0a751fadec8ffbf09e401a2f70217645bc2 SHA1 16699f9e34e6b4cc8c2ce59cd99fe8d349bd5453 SHA256 e2fd762d77bcd3592fa604dbbd71ce3c1d1b8998d9e4513c1bfe318ebbf3d030 -DIST vdr-text2skin-1.3.1.tgz 91191 RMD160 c04f3bea7a2487f2a8b6cf9822d9305231d15d9b SHA1 0dc94c9c7c077fac8ca3b95cc566b9b0e2a65ffa SHA256 176669d979d9b6c12de33d718f14e4bc66efe18160971a9d5c212aa0c6a06cc4 +AUX vdr-text2skin-1.3.2-Makefile.patch 1808 RMD160 5ab08e5edfac0dcfa5082ea72b4624540b83239d SHA1 d190a4a1e5bbec1ec2a674cc34b001ee06e67f1c SHA256 560078ae2d21f9717086035fdd5cb1123a5f8164ed181f131b3aecf5433cfa7a DIST vdr-text2skin-1.3.2.tgz 94476 RMD160 78228e2ae0c511f970101d07f2a1771291fa1214 SHA1 6c32469ee4db13473aeed893d88f2dbdbc1dc16c SHA256 32d3e17cdf3a3b796b4ed7eae1ca8d2c6d56dcc901f4ed71daaf95dd6d2d6331 -DIST vdr-text2skin-1.3.tgz 88819 RMD160 949f58e7d7c85af355cad92113327fb66de9f203 SHA1 0c36fe1e79067d3b9264a3f367ea9a1b575aa7b4 SHA256 99f5552012477199a1d5624df9a8d0ad9576882f3a8364928a8a1f63fcca63f3 -EBUILD vdr-text2skin-1.2.ebuild 1277 RMD160 dba60fa66526762b8248abb14815c3534c09aca6 SHA1 83d08f275d35c1a21960418f31304f2eaf8ce53d SHA256 dcf3fa7677c6ebf181159db73a772036d3f5df76e678b5d4eb7749220d98e4c7 -EBUILD vdr-text2skin-1.3.1.ebuild 1447 RMD160 92397e0fd0665c81e2ce3615076aea574be99de0 SHA1 00131fdf10fdd84ba27ce8b88437014b39933bd8 SHA256 73bf59d74f4e6953b1f8381cf56a6aedfa6c6b5a6f8a7ed31f548249bb2dc282 -EBUILD vdr-text2skin-1.3.2.ebuild 2070 RMD160 4109266b162638f642b53ec8acb468f6e754d76a SHA1 a6722cdfff13a279bd48f8ff143ae400fa12b1aa SHA256 7ab81dc4458601b40276f8cd3c65c742e8b9af0af67f79cc0792b6a0a8cc96e7 -EBUILD vdr-text2skin-1.3.ebuild 1295 RMD160 a1ba756eee8e635ac939f9ce1e8a9e0902171da7 SHA1 27b55ca2ac29497f1a20016add534f9a94f05019 SHA256 94420f5b48ab4f447d1e5ca62bd56ffbcbe2885423a35ecbfb85c8218f36e1e7 -MISC ChangeLog 3484 RMD160 9a93d4d3c3917d37c75765ebaea06c20db147f69 SHA1 de3498389bc8f7bb4095c7f90d67b0cb90ebf386 SHA256 cc02ea657e125bdbab225eb5fca96493d1f8cf1a082d646a802b81f46391b867 +EBUILD vdr-text2skin-1.3.2.ebuild 1971 RMD160 8a996674670f957b59148972e7e85f468c857331 SHA1 aa3d21de069ff4013f1db52c6df2678180efc417 SHA256 dd1f8a7136164b56fd7925ad9237002b02a524eb4516d5df2f923112395181d4 +MISC ChangeLog 3752 RMD160 4714a8aaa82de75ef3c0986f2a4360dc7054f569 SHA1 2c5e98522fbb947b8df4c62b59d91dbf0779b5f1 SHA256 22d90c39bdd61f0c8845b06276907c0203a682cf9c0dfc8590454c8d6cca2881 MISC metadata.xml 335 RMD160 68a8af8c35192d967d3c74d419f4aec0367540d3 SHA1 b45f49fd286f7deb49206d4bd899b579861e094e SHA256 48d9d572a708c22408081c1b8b2d021558710b9cd17c3d3ea5dc4e7a1d455170 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFPgNu0dn07HTTCgIoRAghyAJ4j0XTHHRa/DoEZcPLoPdEGQFyOvgCgs7Js -v1O5/lNzSQPcbk0AEAKFHVo= -=W1W+ +iD8DBQFPoAcpdn07HTTCgIoRAmI2AJ9Qy+Mwe+vaUHwfUxvw3owBRysSUgCgg0u9 +VZdd/Sohz3dXGhFWsrpgiOc= +=NGZG -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch index e01c2c788331..cce51d79febc 100644 --- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch +++ b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch @@ -6,7 +6,7 @@ index daa54d7..1163a8d 100644 # External image lib to use: imagemagick, graphicsmagick, imlib2 or none IMAGELIB = imagemagick -+WANT_I18N=1 ++# # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING # ------------------------------------------------------------- @@ -48,7 +48,7 @@ index daa54d7..1163a8d 100644 ### Internationalization (I18N): - -+ifdef WANT_I18N ++# PODIR = po LOCALEDIR = $(VDRDIR)/locale I18Npo = $(notdir $(wildcard $(PODIR)/*.po)) @@ -56,7 +56,7 @@ index daa54d7..1163a8d 100644 $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po @mkdir -p $(dir $@) msgfmt -c -o $@ $< -+endif ++# .PHONY: i18n i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo) diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild deleted file mode 100644 index 855518bac839..000000000000 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild,v 1.2 2012/01/15 19:31:24 idl0r Exp $ - -EAPI="1" - -inherit vdr-plugin versionator - -DESCRIPTION="VDR text2skin PlugIn" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin" -SRC_URI="mirror://vdr-developerorg/112/${P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86" -#IUSE="truetype direct_blit" -IUSE="+truetype" - -COMMON_DEPEND=">=media-video/vdr-1.3.18 - media-gfx/imagemagick - !media-plugins/vdr-text2skin-cvs - truetype? ( media-libs/freetype )" - -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND}" - -SKINDIR=/usr/share/vdr/${VDRPLUGIN} -ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN} - -src_unpack() { - vdr-plugin_src_unpack unpack - - cd "${S}" - - sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#' - - use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/' - - vdr-plugin_src_unpack all_but_unpack -} - -src_install() { - vdr-plugin_src_install - - keepdir "${SKINDIR}" - - exeinto "${SKINDIR}/contrib" - doexe "${S}"/contrib/skin_to_*.pl - doexe "${S}"/contrib/transform.pl - - dodoc "${S}"/Docs/*.txt -} diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild deleted file mode 100644 index e8bd8878b14b..000000000000 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild,v 1.3 2012/01/15 19:31:24 idl0r Exp $ - -EAPI="2" - -inherit vdr-plugin versionator - -UPLOAD_NR=344 # changes with every version / new file :-( - -DESCRIPTION="VDR text2skin PlugIn" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin" -SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" -#IUSE="truetype direct_blit" -IUSE="+truetype" - -COMMON_DEPEND=">=media-video/vdr-1.6.0 - media-gfx/imagemagick - truetype? ( media-libs/freetype )" - -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND}" - -SKINDIR=/usr/share/vdr/${VDRPLUGIN} -ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN} - -src_prepare() { - sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#' - - sed -i bitmap.c -e "s:8U:(size_t)8U:" - - use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/' - - if ! has_version ">=media-video/vdr-1.7.13"; then - sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile - fi - - vdr-plugin_src_prepare -} - -src_install() { - vdr-plugin_src_install - - keepdir "${SKINDIR}" - - exeinto "${SKINDIR}/contrib" - doexe "${S}"/contrib/skin_to_*.pl - doexe "${S}"/contrib/transform.pl - - dodoc "${S}"/Docs/*.txt -} diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild index aad7efaa3d8e..fa634c81024c 100644 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild +++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.3 2012/04/07 19:08:48 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.4 2012/05/01 15:54:07 hd_brummy Exp $ EAPI="4" -inherit vdr-plugin eutils +inherit vdr-plugin-2 -UPLOAD_NR=783 # changes with every version / new file :-( +VERSION="783" # changes with every version / new file :-( DESCRIPTION="VDR text2skin PlugIn" HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin" -SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz" +SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~amd64" -IUSE="contrib doc +imagemagick imlib nls" +IUSE="contrib doc +imagemagick imlib" REQUIRED_USE="imagemagick? ( !imlib ) imlib? ( !imagemagick )" @@ -26,7 +26,7 @@ RDEPEND=">=media-video/vdr-1.6.0 DEPEND="${RDEPEND} imagemagick? ( dev-util/pkgconfig ) imlib? ( dev-util/pkgconfig ) - nls? ( sys-devel/gettext )" + sys-devel/gettext" src_prepare() { local imagelib= @@ -53,11 +53,7 @@ src_prepare() { fi sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die - if ! use nls; then - sed -i -e 's:^WANT_I18N=.*:WANT_I18N=:' Makefile || die - fi - - vdr-plugin_src_prepare + vdr-plugin-2_src_prepare if has_version ">=media-video/vdr-1.7.27"; then epatch "${FILESDIR}/vdr-1.7.27.diff" @@ -65,7 +61,7 @@ src_prepare() { } src_install() { - vdr-plugin_src_install + vdr-plugin-2_src_install keepdir "/usr/share/vdr/${VDRPLUGIN}" diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild deleted file mode 100644 index e87be2ec2861..000000000000 --- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild,v 1.3 2012/01/15 19:31:24 idl0r Exp $ - -EAPI="2" - -inherit vdr-plugin versionator - -UPLOAD_NR=127 # changes with every version / new file :-( - -DESCRIPTION="VDR text2skin PlugIn" -HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin" -SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" -#IUSE="truetype direct_blit" -IUSE="+truetype" - -COMMON_DEPEND=">=media-video/vdr-1.6.0 - media-gfx/imagemagick - !media-plugins/vdr-text2skin-cvs - truetype? ( media-libs/freetype )" - -DEPEND="${COMMON_DEPEND} - dev-util/pkgconfig" - -RDEPEND="${COMMON_DEPEND}" - -SKINDIR=/usr/share/vdr/${VDRPLUGIN} -ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN} - -src_prepare() { - sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#' - - use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/' - - vdr-plugin_src_prepare -} - -src_install() { - vdr-plugin_src_install - - keepdir "${SKINDIR}" - - exeinto "${SKINDIR}/contrib" - doexe "${S}"/contrib/skin_to_*.pl - doexe "${S}"/contrib/transform.pl - - dodoc "${S}"/Docs/*.txt -} |