uncomment keywords, migrate to eapi 5, update init script and fix python dependency (brltty 4.5 uses cython instead of pyrex).

(Portage version: 2.2.0_alpha183/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

3 files changed, 17 insertions, 21 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index afacd1e81977..6c4f09162e21 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.128 2013/06/21 20:19:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.129 2013/06/22 15:56:17 williamh Exp $
+
+  22 Jun 2013; William Hubbs <williamh@gentoo.org> brltty-4.5.ebuild,
+  files/brltty.rc:
+  uncomment keywords, migrate to eapi 5, update init script and fix python
+  dependency (brltty 4.5 uses cython instead of pyrex).
 
 *brltty-4.5 (21 Jun 2013)
 
diff --git a/app-accessibility/brltty/brltty-4.5.ebuild b/app-accessibility/brltty/brltty-4.5.ebuild
index dfdaac298d44..f1e0c13ad247 100644
--- a/app-accessibility/brltty/brltty-4.5.ebuild
+++ b/app-accessibility/brltty/brltty-4.5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5.ebuild,v 1.1 2013/06/21 20:19:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5.ebuild,v 1.2 2013/06/22 15:56:17 williamh Exp $
+
+EAPI=5
 
-EAPI="4"
 FINDLIB_USE="ocaml"
 
 inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
@@ -14,7 +15,7 @@ SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech
 		tcl X"
@@ -30,7 +31,7 @@ COMMON_DEP="bluetooth? ( net-wireless/bluez )
 	icu? ( dev-libs/icu )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( virtual/libintl )
-	python? ( >=dev-python/pyrex-0.9.4.1 )
+	python? ( >=dev-python/cython-0.16 )
 	tcl? ( >=dev-lang/tcl-8.4.15 )
 	usb? ( virtual/libusb:0 )
 	X? ( x11-libs/libXaw )"
diff --git a/app-accessibility/brltty/files/brltty.rc b/app-accessibility/brltty/files/brltty.rc
index ab3f5ac05761..6001ad31a8dd 100644
--- a/app-accessibility/brltty/files/brltty.rc
+++ b/app-accessibility/brltty/files/brltty.rc
@@ -1,23 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/files/brltty.rc,v 1.4 2009/11/01 18:41:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/files/brltty.rc,v 1.5 2013/06/22 15:56:17 williamh Exp $
+
+command=/bin/brltty
+pidfile=/var/run/brltty.pid
+command_args="-P $pidfile -q"
 
 depend() {
-	if [ -z $svcdir ]; then
 		before *
-	fi
 	after clock
 }
-
-start() {
-	ebegin "Starting brltty"
-	start-stop-daemon --start --exec /bin/brltty -- -P /var/run/brltty.pid -q
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping brltty"
-	start-stop-daemon --stop --pidfile /var/run/brltty.pid
-	eend $?
-}