Version bump. Also fixes bug 371703.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

7 files changed, 155 insertions, 27 deletions

diff --git a/media-plugins/vdr-beep/ChangeLog b/media-plugins/vdr-beep/ChangeLog
index 5d268ae8564f..4e2ee55073a1 100644
--- a/media-plugins/vdr-beep/ChangeLog
+++ b/media-plugins/vdr-beep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-beep
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/ChangeLog,v 1.4 2011/01/28 17:28:03 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/ChangeLog,v 1.5 2012/01/15 19:53:33 idl0r Exp $
+
+*vdr-beep-0.1.2 (15 Jan 2012)
+
+  15 Jan 2012; Christian Ruppert <idl0r@gentoo.org> vdr-beep-0.0.6.ebuild,
+  vdr-beep-0.1.0.ebuild, +vdr-beep-0.1.2.ebuild,
+  +files/vdr-beep-0.1.2-Makefile.patch, metadata.xml:
+  Version bump. Also fixes bug 371703.
 
   28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-beep-0.0.6.ebuild, vdr-beep-0.1.0.ebuild:
diff --git a/media-plugins/vdr-beep/Manifest b/media-plugins/vdr-beep/Manifest
index 4f0d4aacd3dc..2aaacc6a5dd1 100644
--- a/media-plugins/vdr-beep/Manifest
+++ b/media-plugins/vdr-beep/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX vdr-beep-0.1.2-Makefile.patch 2299 RMD160 1598b904e41c5e88be49f2e0265273124e1979c3 SHA1 ff027d46a33c712ead2a2ebf1a8609366bbac40a SHA256 5a4401fdb3b479fe3a5dbbf2e920203674b6529ce78340153a268cf153e4383f
 DIST vdr-beep-0.0.6.tgz 14049 RMD160 1b303add5101130e946b94337d0e865a94607426 SHA1 2a0e0dff741a79c04418a9cc062121b17a58f55b SHA256 60ab9201199ac270c582804cdba8a6c570a2de1e229ea9bf951d966220209a06
 DIST vdr-beep-0.1.0.tgz 16863 RMD160 97b4d9fe3f19ac8855fd15d1b5392d0c6ba297e7 SHA1 eb52f83d90896bdedfe604b8fbeedcf6f4d7b560 SHA256 052661bad89a9afb21b4913c85f5e757634052a42af5903e231e53132773ebfe
-EBUILD vdr-beep-0.0.6.ebuild 529 RMD160 b73d21c791dfafff5bd4c4fccb30a0695db0bfef SHA1 5b57f2392fbda59ce70cd0431e1ec029cf129583 SHA256 da6ac201baa76335d127375b1435160ac67ffad874c1169069ce1d5081990e1c
-EBUILD vdr-beep-0.1.0.ebuild 532 RMD160 6d3ddd9fe1e344c0e89e2c0476896ebc1d7faaa8 SHA1 6105ad331729191d39c468aabcf26d36e1029b10 SHA256 1a4fd10da13d40f848c031c59a8c12ec712a5c91e2c8c332ca28a366e5e97fb8
-MISC ChangeLog 797 RMD160 e2d1192a3a9f6f4f9d3111da584e38ea3313a8a3 SHA1 b493f4d64885d73f9d0ceceb4c0f6aeec048c16f SHA256 b6f796eb8bdc77f60b5672621c4d270f5a92a95fe7961c9a8d857c743bfd4a93
-MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+DIST vdr-beep-0.1.2.tgz 16474 RMD160 118de2813789aea14922101032d438aa06c8f7e9 SHA1 65e2e30b3dc9a1b4d0dbf41092075903c25e0974 SHA256 7202cd35c464b591e4a4e501aa4d60960687bb24813b26c9ed4ac09a0dd1355a
+EBUILD vdr-beep-0.0.6.ebuild 565 RMD160 ae22e11719e86c1d21501636afcbd479a4612853 SHA1 cd1d99d587556a70deb88b8b1f89d30b1e58cd82 SHA256 49fdcc55eafb83d88dbb1390309ff6f5f9b50406c3256de8708230646356d775
+EBUILD vdr-beep-0.1.0.ebuild 578 RMD160 5aea527dd551362eaea1ddb5784c2d7ef124bb92 SHA1 a949203d7ffbc470108fc74ec5b72f65c71a69ff SHA256 fc124724267b0283f16613043d807495a0231ef8df8f73f80048d0e45342d364
+EBUILD vdr-beep-0.1.2.ebuild 820 RMD160 83e4468f5dea040327d0cc13d9069a3133dbb386 SHA1 441f3d8bf7049f4ddf7e92b2e9b444461c1a6b45 SHA256 7c485d25d734b67480943b6c48cc960af7f02cdd2f37b3dd9a107e5d12b6b5c7
+MISC ChangeLog 1042 RMD160 b92da6c6ee2af35bbba1b890bf253e569621baf0 SHA1 0776c3607bbc74b2b06d7f44dc68794547ff5680 SHA256 9b9ce04139beedf418834f28d56844df4fcd7a9255945f5e324930999b2b4347
+MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNQvzEdn07HTTCgIoRAhDbAKCQCl+yaQ+WhA1zQP9gdCqthdsExgCdG2V4
-u0ZbluSrGoKaHj16Fv4cGpE=
-=IuvE
+iQEcBAEBCAAGBQJPEy7EAAoJEMOx0zmdw4Z1A4AIAK9cYgD84+D8yQYClNi/2LDy
+tjOaYXd3AuhoaHMx6CuX3s2707nvmdsE3U0mCHeMm2ZegOs1zRjyF8/4d3wf3lOd
+xW2EPjLLYiIWcfcZXJnZ3XTgQXCGR1twPy3zXTyJ7OcipDXZ/rYOZ3W/2eUsBuDB
+0b/XL2XXVPb42eJL1YHPjy3Re/xNiHwt9yv1SY483yvfGCkhEUFFFTjsU+hDSK1+
+sTwsmWSF6uix8iqVksAzQGONfsJEmn3TBqxV2ds0dYvTJB8bDxhuaQOlyyHxJxqP
+nsSeQ13VP91llOtWOEhdrTEyZqVzzUrBNVRIAxgfyqk90V2Wsu3W+2EUxeQfwcg=
+=0NOQ
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch b/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch
new file mode 100644
index 000000000000..e892f6247ed2
--- /dev/null
+++ b/media-plugins/vdr-beep/files/vdr-beep-0.1.2-Makefile.patch
@@ -0,0 +1,84 @@
+From b000932bf4c89a02a59a0bd24555217b2bdbf651 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Sun, 15 Jan 2012 20:43:11 +0100
+Subject: [PATCH] Makefile improvements
+
+---
+ Makefile |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e9e926d..a87b118 100644
+--- a/Makefile
++++ b/Makefile
+@@ -23,6 +23,8 @@
+ 
+ PLUGIN = beep
+ 
++WANT_I18N=1
++
+ ### The version number of this plugin (taken from the main source file):
+ 
+ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+@@ -30,13 +32,14 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS += -fPIC
+ 
+ ### The directory environment:
+ 
+-VDRDIR = ../../..
+-LIBDIR = ../../lib
+-TMPDIR = /tmp
++VDRDIR ?= ../../..
++LIBDIR ?= ../../lib
++TMPDIR ?= /tmp
+ 
+ ### Allow user defined options to overwrite defaults:
+ 
+@@ -77,7 +80,7 @@ $(DEPFILE): Makefile
+ -include $(DEPFILE)
+ 
+ ### Internationalization (I18N):
+-
++ifdef WANT_I18N
+ PODIR     = po
+ LOCALEDIR = $(VDRDIR)/locale
+ I18Npo    = $(wildcard $(PODIR)/*.po)
+@@ -97,6 +100,7 @@ $(I18Npot): $(wildcard *.c)
+ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ 	@mkdir -p $(dir $@)
+ 	cp $< $@
++endif
+ 
+ .PHONY: i18n
+ i18n: $(I18Nmsgs)
+@@ -106,19 +110,19 @@ i18n: $(I18Nmsgs)
+ all: libvdr-$(PLUGIN).so i18n
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+ 	@mkdir -p $(LIBDIR)
+ 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+ 
+ dist: clean
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+ 	@mkdir $(TMPDIR)/$(ARCHIVE)
+-	@cp -a * $(TMPDIR)/$(ARCHIVE)	
++	@cp -a * $(TMPDIR)/$(ARCHIVE)
+ 	@chmod 644 -R $(TMPDIR)/$(ARCHIVE)/*
+ 	@find $(TMPDIR)/$(ARCHIVE) -type d -exec chmod 755 {} \;
+ 	@find $(TMPDIR)/$(ARCHIVE) -name "*.sh" -exec chmod a+x {} \;
+ 	@chown root.root -R $(TMPDIR)/$(ARCHIVE)/*
+-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) 
++	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+ 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+ 	@echo Distribution package created as $(PACKAGE).tgz
+ 
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-beep/metadata.xml b/media-plugins/vdr-beep/metadata.xml
index d1b88e6872a7..7b718b6f9765 100644
--- a/media-plugins/vdr-beep/metadata.xml
+++ b/media-plugins/vdr-beep/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild b/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild
index e902483f636f..3df094794097 100644
--- a/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild
+++ b/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild,v 1.4 2011/01/28 17:28:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.0.6.ebuild,v 1.5 2012/01/15 19:53:33 idl0r Exp $
 
 EAPI="3"
 
@@ -15,4 +15,6 @@ SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.36"
+RDEPEND=">=media-video/vdr-1.3.36"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
diff --git a/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild b/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild
index 186a6e74c83e..f524bbe455b9 100644
--- a/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild
+++ b/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild,v 1.2 2011/01/28 17:28:03 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.1.0.ebuild,v 1.3 2012/01/15 19:53:33 idl0r Exp $
 
 EAPI="3"
 
 inherit vdr-plugin
 
 DESCRIPTION="VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done etc.)"
-HOMEPAGE="http://deltab.de/vdr/beep.html"
+HOMEPAGE="http://www.deltab.de/content/view/25/62/"
 SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
@@ -15,4 +15,6 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND=">=media-video/vdr-1.6.0
+	sys-devel/gettext"
+DEPEND="${RDEPEND}"
diff --git a/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild b/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild
new file mode 100644
index 000000000000..38ab6e6c2e82
--- /dev/null
+++ b/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-beep/vdr-beep-0.1.2.ebuild,v 1.1 2012/01/15 19:53:33 idl0r Exp $
+
+EAPI="4"
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: Use the PC speaker to signalize some events (shutdown, cut done etc.)"
+HOMEPAGE="http://www.deltab.de/content/view/25/62/"
+SRC_URI="http://www.deltab.de/component/option,com_docman/task,doc_download/gid,104/Itemid,62/ -> ${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="nls"
+
+RDEPEND=">=media-video/vdr-1.6.0"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	if ! use nls; then
+		sed -i -e 's:^WANT_I18N.*::' Makefile || die
+	fi
+
+	vdr-plugin_src_prepare
+}