Cleaning up old ebuilds; Adding missing pkg-config dep, bug #206002 ; Enabling gui backup tool, bug #214293 ; Fixing build against gcc 4.4 , bug #277809 ; Version bump to 0.16 , bug #215399 , ebuild thanks to Nils Schlupp , Anton Bolshakov , et all.

(Portage version: 2.1.6.13/cvs/Linux i686)

10 files changed, 159 insertions, 242 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 1ba8153e606a..8f840e5cbfeb 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-pda/barry
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.7 2008/11/02 21:22:14 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.8 2009/10/18 18:45:50 vostorga Exp $
+
+*barry-0.16 (18 Oct 2009)
+
+  18 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +files/10-blackberry.rules, -barry-0.8.ebuild, -barry-0.9.ebuild,
+  -barry-0.10.ebuild, -barry-0.11.ebuild, -files/barry-0.11-gcc43.patch,
+  +barry-0.16.ebuild, +files/blacklist-berry_charge, metadata.xml:
+  Cleaning up old ebuilds
+  Adding missing pkg-config dep, bug #206002
+  Enabling gui backup tool, bug #214293
+  Fixing build against gcc 4.4 , bug #277809
+  Version bump to 0.16 , bug #215399 , ebuild thanks to Nils Schlupp , Anton
+  Bolshakov , et all.
 
   02 Nov 2008; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Fix malformed XML in metadata.xml. metadata.xml
diff --git a/app-pda/barry/barry-0.10.ebuild b/app-pda/barry/barry-0.10.ebuild
deleted file mode 100644
index e0d0d3bfe2e1..000000000000
--- a/app-pda/barry/barry-0.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.10.ebuild,v 1.1 2007/12/01 18:47:04 jsin Exp $
-
-DESCRIPTION="Barry is an Open Source Linux application that will allow
-synchronization, backup, restore, program management, and charging for BlackBerry devices"
-HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
-SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libusb
-	dev-libs/openssl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS
-
-	#  udev rules
-	insinto /etc/udev/rules.d
-	newins udev/10-blackberry.rules 10-blackberry.rules
-}
diff --git a/app-pda/barry/barry-0.11.ebuild b/app-pda/barry/barry-0.11.ebuild
deleted file mode 100644
index ca9cf172be92..000000000000
--- a/app-pda/barry/barry-0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.11.ebuild,v 1.2 2008/07/27 11:36:31 loki_val Exp $
-
-inherit base
-
-DESCRIPTION="Barry is an Open Source Linux application that will allow
-synchronization, backup, restore, program management, and charging for BlackBerry devices"
-HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
-SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libusb
-	dev-libs/openssl"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS
-
-	#  udev rules
-	insinto /etc/udev/rules.d
-	newins udev/10-blackberry.rules 10-blackberry.rules
-}
diff --git a/app-pda/barry/barry-0.16.ebuild b/app-pda/barry/barry-0.16.ebuild
new file mode 100644
index 000000000000..513abcd97907
--- /dev/null
+++ b/app-pda/barry/barry-0.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.1 2009/10/18 18:45:50 vostorga Exp $
+
+inherit base
+
+DESCRIPTION="Allow synchronization, backup, restore,
+program management, and charging for BlackBerry devices"
+HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
+SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost doc gui opensync"
+
+DEPEND="dev-libs/libusb
+	dev-libs/openssl
+	dev-util/pkgconfig
+	sys-libs/zlib
+	boost? 	( >=dev-libs/boost-1.33  )
+	doc?	( >=app-doc/doxygen-1.5.6 )
+	gui? 	( >=dev-cpp/gtkmm-2.4
+				>=dev-cpp/libglademm-2.4
+				>=dev-cpp/glibmm-2.4
+				=dev-libs/libtar-1.2.11-r2 )
+	opensync? ( =app-pda/libopensync-0.22* )"
+RDEPEND="dev-libs/libusb
+	sys-libs/zlib
+	boost?  ( >=dev-libs/boost-1.33  )
+	gui?    ( >=dev-cpp/gtkmm-2.4
+				>=dev-cpp/libglademm-2.4
+				>=dev-cpp/glibmm-2.4 )
+	opensync? ( =app-pda/libopensync-0.22* )"
+
+
+src_compile(){
+	econf \
+		$(use_with boost boost =/usr/include) \
+		$(use_enable gui) \
+		$(use_with gui libtar =/usr/lib) \
+		$(use_with gui libz =/usr/lib) \
+		$(use_enable opensync opensync-plugin)
+	emake || die "emake failed!"
+
+	if use doc ; then
+		cd "${S}"
+		doxygen
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	if use doc; then
+		dodoc AUTHORS NEWS README || die "dodoc failed"
+		dohtml doc/www/doxygen/html/*  || die "dohtml failed"
+	fi
+
+	#  udev rules
+	insinto /etc/udev/rules.d
+	newins "${FILESDIR}"/10-blackberry.rules 10-blackberry.rules
+
+	#  blacklist for BERRY_CHARGE kernel module
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/blacklist-berry_charge blacklist-berry_charge
+
+	#if use gui ; then
+		# Add an entry into K Menu or gnome's menu if available.
+	#fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Users must be in the 'plugdev' group to access the Barry toolset."
+	elog
+	elog "Type 'btool' to launch the command-line Barry interface."
+	use gui && elog "Type 'barrybackup' to launch the GUI backup/restore tool."
+	ewarn
+	ewarn "Barry and the in-kernel module 'BERRY_CHARGE' are incompatible."
+	ewarn
+	ewarn "Kernel-based USB suspending can discharge your blackberry."
+	ewarn "Use at least kernel 2.6.22 and/or disable USB_SUSPEND."
+	ewarn
+}
+
diff --git a/app-pda/barry/barry-0.8.ebuild b/app-pda/barry/barry-0.8.ebuild
deleted file mode 100644
index 421a8444ca44..000000000000
--- a/app-pda/barry/barry-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.8.ebuild,v 1.2 2007/09/16 13:32:43 mr_bones_ Exp $
-
-DESCRIPTION="Barry is an Open Source Linux application that will allow
-synchronization, backup, restore, program management, and charging for BlackBerry devices"
-HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
-SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libusb
-	dev-libs/openssl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS
-
-	#  udev rules
-	insinto /etc/udev/rules.d
-	newins udev/10-blackberry.rules 10-blackberry.rules
-}
diff --git a/app-pda/barry/barry-0.9.ebuild b/app-pda/barry/barry-0.9.ebuild
deleted file mode 100644
index 980fe0a8426f..000000000000
--- a/app-pda/barry/barry-0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.9.ebuild,v 1.1 2007/11/19 21:01:06 jsin Exp $
-
-DESCRIPTION="Barry is an Open Source Linux application that will allow
-synchronization, backup, restore, program management, and charging for BlackBerry devices"
-HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
-SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libusb
-	dev-libs/openssl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS
-
-	#  udev rules
-	insinto /etc/udev/rules.d
-	newins udev/10-blackberry.rules 10-blackberry.rules
-}
diff --git a/app-pda/barry/files/10-blackberry.rules b/app-pda/barry/files/10-blackberry.rules
new file mode 100644
index 000000000000..c92ac684209e
--- /dev/null
+++ b/app-pda/barry/files/10-blackberry.rules
@@ -0,0 +1,51 @@
+#
+# Blackberry devices
+#
+# Note: the following rules may appear wasteful, in that bcharge is run
+#       twice: once for changing the mode, and once again after the
+#       device resets itself to enter this mode.  This is required
+#       in order to support older kernels (approx. 2.6.20 to 2.6.22) with
+#       CONFIG_USB_SUSPEND enabled.  The second time bcharge is run
+#       is when the -p argument comes into play, adjusting the device's
+#       autosuspend settings.
+#
+# Note: SUBSYSTEM=="usb_device" is not reliably available on all kernels
+#       and all versions of udev, so instead we use the very first
+#       kernel message of: SUBSYSTEM=="usb", ENV{DEVTYPE}="usb_device"
+#       (See the output of 'udevadm monitor --kernel')
+#       Since the device is likely not created at this point, we
+#       can't set permissions... so permissions are handled in the
+#       generic 99-blackberry-perms.rules file.
+#
+
+#
+# Older devices that only use 0x0001 (no USB Mass Storage)
+#
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", \
+	ATTR{idVendor}=="0fca", ATTR{idProduct}=="0001", \
+	RUN="/usr/sbin/bcharge -p %p"
+
+#
+# Newer devices with USB Mass Storage:
+#     0x8007 usually get transformed into 0x8004
+#     0x8004 sometimes get transformed into 0x0004
+#     0x0006 usually get transformed into 0x0004
+#
+
+# 0x0006 turns into 0x0004, so no need to fiddle with autosuspend here
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", \
+	ATTR{idVendor}=="0fca", ATTR{idProduct}=="0006", \
+	RUN="/usr/sbin/bcharge"
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", \
+	ATTR{idVendor}=="0fca", ATTR{idProduct}=="8007", \
+	RUN="/usr/sbin/bcharge -p %p"
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", \
+	ATTR{idVendor}=="0fca", ATTR{idProduct}=="8004", \
+	RUN="/usr/sbin/bcharge -p %p"
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ACTION=="add", \
+	ATTR{idVendor}=="0fca", ATTR{idProduct}=="0004", \
+	RUN="/usr/sbin/bcharge -p %p"
+
diff --git a/app-pda/barry/files/barry-0.11-gcc43.patch b/app-pda/barry/files/barry-0.11-gcc43.patch
deleted file mode 100644
index 1a2a5096a540..000000000000
--- a/app-pda/barry/files/barry-0.11-gcc43.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ur barry-0.12.orig/examples/addcalendar.cc barry-0.12/examples/addcalendar.cc
---- barry-0.12.orig/examples/addcalendar.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/examples/addcalendar.cc	2008-06-24 15:55:57.000000000 -0400
-@@ -24,6 +24,7 @@
- #include <time.h>
- #include <barry/barry.h>
- #include <iostream>
-+#include <cstring>
- 
- using namespace std;
- using namespace Barry;
-diff -ur barry-0.12.orig/src/controller.cc barry-0.12/src/controller.cc
---- barry-0.12.orig/src/controller.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/controller.cc	2008-06-24 15:52:17.000000000 -0400
-@@ -29,14 +29,13 @@
- #include "builder.h"
- #include "endian.h"
- #include "packet.h"
-+#include <sstream>
-+#include <iomanip>
-+#include <cstring>
- 
- #define __DEBUG_MODE__
- #include "debug.h"
- 
--#include <sstream>
--
--#include <iomanip>
--
- namespace Barry {
- 
- //
-diff -ur barry-0.12.orig/src/data.cc barry-0.12/src/data.cc
---- barry-0.12.orig/src/data.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/data.cc	2008-06-24 15:48:25.000000000 -0400
-@@ -25,6 +25,8 @@
- #include <iomanip>
- #include <string>
- #include <stdexcept>
-+#include <cstring>
-+#include <cstdlib>
- 
- //#define __DEBUG_MODE__
- #include "debug.h"
-Only in barry-0.12.orig/src: data.loT
-diff -ur barry-0.12.orig/src/ldif.cc barry-0.12/src/ldif.cc
---- barry-0.12.orig/src/ldif.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/ldif.cc	2008-06-24 15:48:51.000000000 -0400
-@@ -25,6 +25,7 @@
- #include <stdexcept>
- #include <iostream>
- #include <iomanip>
-+#include <cstring>
- 
- #define __DEBUG_MODE__
- #include "debug.h"
-diff -ur barry-0.12.orig/src/packet.cc barry-0.12/src/packet.cc
---- barry-0.12.orig/src/packet.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/packet.cc	2008-06-24 15:51:39.000000000 -0400
-@@ -30,6 +30,7 @@
- #include "parser.h"
- #include "builder.h"
- #include "error.h"
-+#include <cstring>
- 
- #define __DEBUG_MODE__
- #include "debug.h"
-diff -ur barry-0.12.orig/src/r_calendar.cc barry-0.12/src/r_calendar.cc
---- barry-0.12.orig/src/r_calendar.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/r_calendar.cc	2008-06-24 15:50:20.000000000 -0400
-@@ -31,6 +31,7 @@
- #include <iomanip>
- #include <time.h>
- #include <stdexcept>
-+#include <cstring>
- 
- #define __DEBUG_MODE__
- #include "debug.h"
-diff -ur barry-0.12.orig/src/r_task.cc barry-0.12/src/r_task.cc
---- barry-0.12.orig/src/r_task.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/r_task.cc	2008-06-24 15:51:04.000000000 -0400
-@@ -28,6 +28,7 @@
- #include "debug.h"
- #include <ostream>
- #include <iomanip>
-+#include <cstring>
- 
- using namespace std;
- using namespace Barry::Protocol;
-diff -ur barry-0.12.orig/src/record.cc barry-0.12/src/record.cc
---- barry-0.12.orig/src/record.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/record.cc	2008-06-24 15:50:00.000000000 -0400
-@@ -36,6 +36,7 @@
- #include <iomanip>
- #include <time.h>
- #include <stdexcept>
-+#include <cstring>
- 
- #define __DEBUG_MODE__
- #include "debug.h"
-diff -ur barry-0.12.orig/src/socket.cc barry-0.12/src/socket.cc
---- barry-0.12.orig/src/socket.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/src/socket.cc	2008-06-24 15:49:14.000000000 -0400
-@@ -30,7 +30,7 @@
- #include "endian.h"
- #include <openssl/sha.h>
- #include <sstream>
--
-+#include <cstring>
- 
- using namespace Usb;
- 
-diff -ur barry-0.12.orig/tools/btool.cc barry-0.12/tools/btool.cc
---- barry-0.12.orig/tools/btool.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/tools/btool.cc	2008-06-24 15:53:09.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <vector>
- #include <string>
- #include <getopt.h>
-+#include <memory>
- 
- 
- using namespace std;
-diff -ur barry-0.12.orig/tools/btranslate.cc barry-0.12/tools/btranslate.cc
---- barry-0.12.orig/tools/btranslate.cc	2008-06-24 15:47:55.000000000 -0400
-+++ barry-0.12/tools/btranslate.cc	2008-06-24 15:55:23.000000000 -0400
-@@ -17,6 +17,9 @@
- #include <iostream>
- #include <iomanip>
- #include <sstream>
-+#include <cstdlib>
-+#include <cstring>
-+#include <climits>
- 
- using namespace std;
- 
diff --git a/app-pda/barry/files/blacklist-berry_charge b/app-pda/barry/files/blacklist-berry_charge
new file mode 100644
index 000000000000..1ba982bb7e58
--- /dev/null
+++ b/app-pda/barry/files/blacklist-berry_charge
@@ -0,0 +1,3 @@
+# conflicts with Barry's bcharge utility
+blacklist berry_charge
+
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index 2ddd3604017e..0cca89529ae9 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -7,4 +7,9 @@
   allow synchronization, backup, restore, program 
   management, and charging for BlackBerry devices.
 </longdescription>
+<use>
+  <flag name='boost'>Enable boost support</flag>
+  <flag name='gui'>Gui backup tool support</flag>
+  <flag name='opensync'>Enabling opensync plugin</flag>
+</use>
 </pkgmetadata>