Version bump (#260303). Migrate to EAPI 2.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 34 insertions, 81 deletions

diff --git a/app-mobilephone/gammu/ChangeLog b/app-mobilephone/gammu/ChangeLog
index 50f497371c26..9a3d7340bc5c 100644
--- a/app-mobilephone/gammu/ChangeLog
+++ b/app-mobilephone/gammu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/gammu
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.66 2009/03/08 16:16:21 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/ChangeLog,v 1.67 2009/05/10 10:16:48 mrness Exp $
+
+*gammu-1.24.0 (10 May 2009)
+
+  10 May 2009; Alin Năstac <mrness@gentoo.org> -gammu-1.20.0-r1.ebuild,
+  -gammu-1.21.0.ebuild, +gammu-1.24.0.ebuild:
+  Version bump (#260303). Migrate to EAPI 2.
 
   08 Mar 2009; Markus Meier <maekke@gentoo.org> gammu-1.22.1-r2.ebuild:
   amd64/x86 stable, bug #259521
diff --git a/app-mobilephone/gammu/gammu-1.20.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.20.0-r1.ebuild
deleted file mode 100644
index affe8f9d95b4..000000000000
--- a/app-mobilephone/gammu/gammu-1.20.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.20.0-r1.ebuild,v 1.3 2008/11/08 13:16:28 nixnut Exp $
-
-inherit cmake-utils
-
-DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
-HOMEPAGE="http://www.gammu.org"
-SRC_URI="ftp://dl.cihar.com/gammu/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug bluetooth irda mysql postgres nls"
-
-RDEPEND="bluetooth? ( net-wireless/bluez-libs )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-server )
-	dev-util/dialog"
-DEPEND="${RDEPEND}
-	irda? ( virtual/os-headers )
-	nls? ( sys-devel/gettext )
-	dev-util/cmake"
-
-# 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=" cs de es it pl ru"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_unpack() {
-	unpack ${A}
-
-	pushd "${S}"/locale || die "locale directory not found"
-	local lang support_linguas=no
-	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
-		fi
-	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				sed -i -e "/^[[:space:]]*${lang}[[:space:]]*$/d" CMakeLists.txt
-			fi
-		done
-	fi
-	popd
-}
-
-src_compile() {
-	# debug flag is used inside cmake-utils.eclass
-	local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \
-		$(cmake-utils_use_with irda IrDA) \
-		$(cmake-utils_use_with mysql MySQL) \
-		$(cmake-utils_use_with postgres Postgres) \
-		-DENABLE_SHARED=ON"
-	cmake-utils_src_compile
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
-}
diff --git a/app-mobilephone/gammu/gammu-1.21.0.ebuild b/app-mobilephone/gammu/gammu-1.24.0.ebuild
index f0e058e37b33..659e4f2b3d81 100644
--- a/app-mobilephone/gammu/gammu-1.21.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.24.0.ebuild
@@ -1,22 +1,27 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.21.0.ebuild,v 1.1 2008/11/02 12:46:58 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gammu/gammu-1.24.0.ebuild,v 1.1 2009/05/10 10:16:48 mrness Exp $
 
-inherit cmake-utils
+EAPI="2"
+
+inherit cmake-utils distutils
 
 DESCRIPTION="a fork of the gnokii project, a tool to handle your cellular phone"
 HOMEPAGE="http://www.gammu.org"
-SRC_URI="ftp://dl.cihar.com/gammu/releases/${P}.tar.bz2"
+SRC_URI="http://dl.cihar.com/gammu/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug bluetooth irda mysql postgres nls"
 
-RDEPEND="bluetooth? ( net-wireless/bluez-libs )
+# TODO after bug 247687 gets solved: usb? ( >=dev-libs/libusb-1.0.0 )
+RDEPEND="bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )
-	dev-util/dialog"
+	dev-util/dialog
+	dev-lang/python
+	!dev-python/python-gammu" # needs to be removed from the tree
 DEPEND="${RDEPEND}
 	irda? ( virtual/os-headers )
 	nls? ( sys-devel/gettext )
@@ -25,13 +30,10 @@ DEPEND="${RDEPEND}
 # 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=" cs de es id it pl ru"
+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"
 IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
-src_unpack() {
-	unpack ${A}
-
-	pushd "${S}"/locale || die "locale directory not found"
+src_prepare() {
 	local lang support_linguas=no
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
 		if use linguas_${lang} ; then
@@ -43,23 +45,33 @@ src_unpack() {
 	if [ "${support_linguas}" = "yes" ]; then
 		for lang in ${MY_AVAILABLE_LINGUAS} ; do
 			if ! use linguas_${lang} ; then
-				sed -i -e "/^[[:space:]]*${lang}[[:space:]]*$/d" CMakeLists.txt
+				rm -rf locale/${lang} || die
 			fi
 		done
 	fi
-	popd
 }
 
-src_compile() {
+src_configure() {
 	# debug flag is used inside cmake-utils.eclass
+	# TODO	$(cmake-utils_use_with usb USB) \
 	local mycmakeargs="$(cmake-utils_use_with bluetooth Bluez) \
 		$(cmake-utils_use_with irda IrDA) \
 		$(cmake-utils_use_with mysql MySQL) \
 		$(cmake-utils_use_with postgres Postgres) \
-		-DENABLE_SHARED=ON"
+		-DBUILD_SHARED_LIBS=ON -DINSTALL_DOC_DIR=share/doc/${PF} \
+		-DBUILD_PYTHON=/usr/bin/python"
+	cmake-utils_src_configure
+}
+
+src_compile() {
 	cmake-utils_src_compile
 }
 
 src_test() {
 	LD_LIBRARY_PATH="${WORKDIR}"/${PN}_build/common cmake-utils_src_test
 }
+
+src_install() {
+	cmake-utils_src_install
+}
+