Version bump (bug #291648), also fixed bug #267512, dropped old.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 49 insertions, 62 deletions

diff --git a/app-mobilephone/obex-data-server/ChangeLog b/app-mobilephone/obex-data-server/ChangeLog
index 14efc7af5c3a..dd08debe1ae7 100644
--- a/app-mobilephone/obex-data-server/ChangeLog
+++ b/app-mobilephone/obex-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-mobilephone/obex-data-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.20 2009/11/04 03:02:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/ChangeLog,v 1.21 2009/11/16 10:12:49 dev-zero Exp $
+
+*obex-data-server-0.4.5 (16 Nov 2009)
+
+  16 Nov 2009; Tiziano Müller <dev-zero@gentoo.org>
+  -obex-data-server-0.1.ebuild, -obex-data-server-0.3.4.ebuild,
+  +obex-data-server-0.4.5.ebuild:
+  Version bump (bug #291648), also fixed bug #267512, dropped old.
 
   04 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
   obex-data-server-0.4.4.ebuild:
diff --git a/app-mobilephone/obex-data-server/obex-data-server-0.1.ebuild b/app-mobilephone/obex-data-server/obex-data-server-0.1.ebuild
deleted file mode 100644
index 64907c813e46..000000000000
--- a/app-mobilephone/obex-data-server/obex-data-server-0.1.ebuild
+++ /dev/null
@@ -1,28 +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/obex-data-server/obex-data-server-0.1.ebuild,v 1.3 2008/02/10 11:50:21 eva Exp $
-
-EAPI=1
-
-DESCRIPTION="a DBus service providing easy to use API for using OBEX"
-HOMEPAGE="http://tadas.dailyda.com/blog/"
-SRC_URI="http://tadas.dailyda.com/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/dbus-glib-0.7
-	>=net-wireless/bluez-libs-3.13
-	>=dev-libs/openobex-1.3"
-DEPEND="
-	dev-util/pkgconfig
-	${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-mobilephone/obex-data-server/obex-data-server-0.3.4.ebuild b/app-mobilephone/obex-data-server/obex-data-server-0.3.4.ebuild
deleted file mode 100644
index 04927fe01b08..000000000000
--- a/app-mobilephone/obex-data-server/obex-data-server-0.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.3.4.ebuild,v 1.2 2009/02/24 01:40:49 josejx Exp $
-
-EAPI=1
-
-DESCRIPTION="a DBus service providing easy to use API for using OBEX"
-HOMEPAGE="http://tadas.dailyda.com/blog/category/obex-data-server/"
-SRC_URI="http://tadas.dailyda.com/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-IUSE="debug"
-
-RDEPEND="
-	dev-libs/glib:2
-	>=dev-libs/dbus-glib-0.7
-	>=net-wireless/bluez-libs-3.13
-	>=dev-libs/openobex-1.3"
-DEPEND="
-	dev-util/pkgconfig
-	${RDEPEND}"
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-mobilephone/obex-data-server/obex-data-server-0.4.5.ebuild b/app-mobilephone/obex-data-server/obex-data-server-0.4.5.ebuild
new file mode 100644
index 000000000000..ae15aaac077a
--- /dev/null
+++ b/app-mobilephone/obex-data-server/obex-data-server-0.4.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.5.ebuild,v 1.1 2009/11/16 10:12:49 dev-zero Exp $
+
+EAPI="2"
+
+DESCRIPTION="A DBus service providing easy to use API for using OBEX"
+HOMEPAGE="http://tadas.dailyda.com/blog/category/obex-data-server/"
+SRC_URI="http://tadas.dailyda.com/software/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+IUSE="debug gtk imagemagick usb"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/dbus-glib-0.7
+	sys-apps/dbus
+	>=net-wireless/bluez-4.31
+	>=dev-libs/openobex-1.3
+	imagemagick? ( !gtk? ( media-gfx/imagemagick ) )
+	gtk? ( x11-libs/gtk+ )
+	usb? ( virtual/libusb:0 )
+	!app-mobilephone/obexd"
+DEPEND="dev-util/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	local bip="no"
+	use imagemagick && bip="magick"
+	use gtk && bip="gdk-pixbuf"
+	econf \
+		--enable-bip=${bip} \
+		$(use usb || echo "--disable-usb") \
+		--disable-system-config \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}