Version bump wrt bug 485260

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 42618354)

2 files changed, 41 insertions, 20 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 3de56129f9d9..98073ee5dd93 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.94 2013/09/17 21:06:35 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.95 2013/10/09 01:20:17 creffett Exp $
+
+*gammu-1.33.0 (09 Oct 2013)
+
+  09 Oct 2013; Chris Reffett <creffett@gentoo.org> +gammu-1.33.0.ebuild,
+  -gammu-1.25.0-r1.ebuild:
+  Version bump wrt bug 485260
 
 *gammu-1.32.0-r1 (17 Sep 2013)
 
diff --git a/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.33.0.ebuild
index c4311aaa8efb..413e970cacde 100644
--- a/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.33.0.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.25.0-r1.ebuild,v 1.8 2011/08/13 07:15:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.33.0.ebuild,v 1.1 2013/10/09 01:20:17 creffett Exp $
 
-EAPI="3"
+EAPI=5
+
+PYTHON_DEPEND="python? 2"
 
 inherit eutils cmake-utils python
 
-DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
-HOMEPAGE="http://www.gammu.org"
-SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2"
+DESCRIPTION="A tool to handle your cellular phone"
+HOMEPAGE="http://www.wammu.eu/"
+SRC_URI="http://dl.cihar.com/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl debug bluetooth irda mysql postgres dbi nls python"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion bluetooth curl dbi debug irda mysql nls postgres python usb"
 
 RDEPEND="bluetooth? ( net-wireless/bluez )
 	curl? ( net-misc/curl )
+	usb? ( virtual/libusb:1 )
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-server )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
-	dev-util/dialog
-	dev-lang/python
-	!dev-python/python-gammu" # needs to be removed from the tree
+	dev-util/dialog"
 DEPEND="${RDEPEND}
 	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/cmake"
+	nls? ( sys-devel/gettext )"
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation
 # Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" af bg ca cs da de el es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv zh_CN zh_TW"
+MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-skip-locktest.patch
+	epatch "${FILESDIR}/${PN}-skip-locktest.patch"
+	epatch "${FILESDIR}/${PN}-1.32.0-bashcompdir.patch"
 
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
@@ -56,18 +64,25 @@ src_prepare() {
 
 src_configure() {
 	# debug flag is used inside cmake-utils.eclass
-	local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \
+	local mycmakeargs=(
+		$(cmake-utils_use_with bluetooth Bluez) \
 		$(cmake-utils_use_with irda IRDA) \
 		$(cmake-utils_use_with curl CURL) \
+		$(cmake-utils_use_with usb USB) \
 		$(cmake-utils_use_with python PYTHON) \
 		$(cmake-utils_use_with mysql MySQL) \
 		$(cmake-utils_use_with postgres Postgres) \
 		$(cmake-utils_use_with dbi LibDBI) \
 		$(cmake-utils_use_with nls GettextLibs) \
 		$(cmake-utils_use_with nls Iconv) \
-		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF}"
+		-DBUILD_SHARED_LIBS=ON \
+		-DINSTALL_DOC_DIR="share/doc/${PF}"
+	)
+	if ! use bash-completion; then
+		mycmakeargs+=( -DINSTALL_BASH_COMPLETION=OFF )
+	fi
 	if use python; then
-		mycmakeargs="${mycmakeargs} -DBUILD_PYTHON=/usr/bin/python"
+		mycmakeargs+=( -DBUILD_PYTHON="$(PYTHON -a)" )
 	fi
 	cmake-utils_src_configure
 }
@@ -77,7 +92,7 @@ src_compile() {
 }
 
 src_test() {
-	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
+	LD_LIBRARY_PATH="${WORKDIR}/${PN}_build/common" cmake-utils_src_test
 }
 
 src_install() {