Version bump. Major ebuild rewrite fixing many issues. Closes bug #360101

(install udev rules into /lib, not /etc) and bug #360103 (stop using plugdev
group). Add USE="opensync" for barry-sync plugin, install bash-completion and
pppd scripts.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 138 insertions, 26 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index e506ccdbcf38..95e5843020eb 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.19 2011/03/29 06:13:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.20 2011/04/13 07:10:36 dirtyepic Exp $
+
+*barry-0.17.1 (13 Apr 2011)
+
+  13 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> +barry-0.17.1.ebuild,
+  metadata.xml:
+  Version bump. Major ebuild rewrite fixing many issues. Closes bug #360101
+  (install udev rules into /lib, not /etc) and bug #360103 (stop using plugdev
+  group). Add USE="opensync" for barry-sync plugin, install bash-completion and
+  pppd scripts.
 
   29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> barry-0.16.ebuild:
   Fix slot-dep on gnome-mm libs
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index 4ff319e79d78..ffee4fcdb0f7 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -5,23 +5,15 @@ AUX 10-blackberry.rules 1983 RMD160 bea10908beef0558402b8a8888ebc0ea4e561562 SHA
 AUX barry-0.16-gcc45.patch 310 RMD160 42a67dc4baba475a1ef0352d2efc842d21cfaf7a SHA1 3247f8f102e8e5a72be89206df0891b641ebaa1a SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6
 AUX blacklist-berry_charge.conf 65 RMD160 5fbc61819a71cb266a93053c99d32ea2424c5683 SHA1 5320c555ecd5b844bb4db5a238538abc472b2516 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e
 DIST barry-0.16.tar.bz2 4981342 RMD160 407d1ae1d4c42a589093bd2cc4ad791f230ab23c SHA1 011b1f42c3832f30942744dc8f577dc0eaf2189c SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220
+DIST barry-0.17.1.tar.bz2 7618810 RMD160 444ac06937bde1b913b6a3132dce25caebc066c1 SHA1 99fbf38a124d0836ca386f21c8604ae8fb6a740b SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae
 EBUILD barry-0.16.ebuild 2346 RMD160 ec9b471c88c5eae700633dc4801039647c3c2be3 SHA1 0536b0b0c94f4d6d15c7c808b0a50953b49f2ef2 SHA256 a031033b595b7439f17608fddc52bb9d56405ea704fdb6e2f7a9a5972d4ee7f6
-MISC ChangeLog 3296 RMD160 5b5171deffacd885661cd87d25a4cb66cadb6a8f SHA1 04039f82451a166eb0b8cd2bd380b2fe2c227bde SHA256 34a96436c11c2f341f9ee755d8a952937100e220d0431e8dc86ec32b3df2b295
-MISC metadata.xml 471 RMD160 08677f2b97f130e9bb22b1b8a47e28c5d29be9ce SHA1 6079e9208c4b4c60c2253bfa53fff44132ba58b2 SHA256 3dcf4e5e1b68cead695a69c048df829d9f4da941a0524151eff5b698dc361620
+EBUILD barry-0.17.1.ebuild 2594 RMD160 bf2d61d7685c43eb50c4744cf18351ba92f76bb7 SHA1 3fc93e722fa9e1f09419c1fe8380989d393ee075 SHA256 a90d7453e06426f34b2efac661ace63fca4c1b7f88cbcf2524bc0306bdd30d4a
+MISC ChangeLog 3664 RMD160 a10baa759ba60ce2cd9e118dcb34ba668b935449 SHA1 57ff00f9ab1b8d85a6d6aeb5ba2e58d0afe58b90 SHA256 0f05ec4b1a1046af1aa28fecd22cfcd954b82252bbc2de83964dc2aecbab5cee
+MISC metadata.xml 612 RMD160 595ca42f506b2cd4210929dbfe814719b0cb60e0 SHA1 3980d439b80c0fc90a34e1a829f48e6965bca8e5 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXh0AAoJEO/kOhxWD91kHKgQAJx6f8Bgl7NnIlomp2g4xGJP
-y9NmvFNRtK4gN/xfE9NEEMPmE5zg5EJV6woGHPct1auHW/6dGBhrtw8Yn8L0i1NW
-+IbQwNLZVm/84inEdiY4rdyxZPrPhBPMggpc1Arh+Y86pLbCHRHAKuQFX21NiDEC
-76Xl4W7dozmo0l1lLCeXcXJ+hDY8HoIzZPmVgfwGiBNBM694tb2zZt3Gg2G8+yiu
-tWUMqsqZG//tzEPqOhKxqiUYEW1u4pWwIm85y+eP0VRrj8LCMgFsXWe75oubKKYG
-7QoNLPNYzyUt7Aqa6hqINNVAlc/BZZ2k6XlWH/3+yCpRhUF2DGRDEdwiimwaLlqX
-ipPjitt8N1NHsef/jH2MSEm/x3M7OujtRfVm9fdEHDnhN8v+D8266vwRJ7avhptR
-EV3GwcoXmMF1BEpDVjMDnEAIlyWHqTMZFnFyWlssc+cVzmsPFHUVIcV4JPs9zc/f
-+80xOYK3UCdrTltjfA+AepcEJTmftAFgPj8c2Gl7DMlpUm3fx1S1x25EAwvAaZ1H
-7qcaDqylCzhMWlKg7xp11IeAD62iPAqDeL4uaXYlsbUpM68yWfd6+nX1wdJzRilY
-Ly9XpveneEiM1UOB7DssbrR6EuP/smGWHGsAHBIY8OMadWgeEe3Qj7Hs9U4RA/pT
-KnaHzg5NscfTjJZ00t9j
-=ubAb
+iEYEARECAAYFAk2lTfIACgkQiqiDRvmkBmILUwCgtUBb91hs5FFDAaSuXT4GyqjX
+/7AAniXNtYe7iGyYoJuxPat7vC2hOCb2
+=XOZk
 -----END PGP SIGNATURE-----
diff --git a/app-pda/barry/barry-0.17.1.ebuild b/app-pda/barry/barry-0.17.1.ebuild
new file mode 100644
index 000000000000..1492fa66460d
--- /dev/null
+++ b/app-pda/barry/barry-0.17.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.17.1.ebuild,v 1.1 2011/04/13 07:10:36 dirtyepic Exp $
+
+EAPI="4"
+
+inherit autotools-utils bash-completion eutils
+
+DESCRIPTION="Sync, backup, 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 nls static-libs"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libusb:0
+	dev-libs/openssl
+	sys-libs/zlib
+	>=dev-cpp/libxmlpp-2.6
+	>=dev-libs/libtar-1.2.11-r2
+	boost?	( >=dev-libs/boost-1.33 )
+	gui?	( dev-cpp/glibmm:2
+			  dev-cpp/gtkmm:2.4
+			  dev-cpp/libglademm:2.4 )
+	opensync? ( ~app-pda/libopensync-0.22 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0
+	doc?	( >=app-doc/doxygen-1.5.6 )
+	nls?	( >=sys-devel/gettext-0.17 )"
+
+DOCS=(AUTHORS DEPUTY ChangeLog NEWS README TODO)
+
+src_configure() {
+	myeconfargs=(
+		$(use_enable boost)
+		$(use_enable gui)
+		$(use_enable nls)
+		$(use_enable opensync opensync-plugin)
+		--disable-rpath
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	if use doc ; then
+		cd "${S}"
+		doxygen || die
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# docs
+	rm -rf "${S}"/doc/www/*.php
+	rm -rf "${S}"/doc/www/*.sh
+	find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} +
+
+	if use doc; then
+		dohtml "${S}"/doc/www/doxygen/html/*
+	fi
+
+	rm -rf "${S}"/doc/www
+	dodoc -r "${S}"/doc/*
+
+	#  udev rules
+	insinto /lib/udev/rules.d
+	doins "${S}"/udev/10-blackberry.rules
+#	doins "${S}"/udev/69-blackberry.rules
+	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
+	doins "${S}"/udev/99-blackberry-perms.rules
+
+	#  blacklist for BERRY_CHARGE kernel module
+	insinto /etc/modprobe.d
+	doins "${S}"/modprobe/blacklist-berry_charge.conf
+
+	# pppd options files
+	docinto "${DOCDIR}"/ppp/
+	dodoc "${S}"/ppp/*
+
+	BASHCOMPFILES="${S}/bash/btool ${S}/bash/bjavaloader"
+	dobashcompletion
+
+	if use gui; then
+		domenu "${S}"/menu/barrybackup.desktop || die
+		doicon "${S}"/logo/barry_logo_icon.png || die
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	elog "Barry requires you to be a member of the \"usb\" group."
+	einfo
+	bash-completion_pkg_postinst
+	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 CONFIG_USB_SUSPEND."
+	ewarn
+}
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index 9adb88570783..cc518f83b800 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>pda</herd>
-<longdescription lang="en">
-  Barry is an Open Source Linux application that will
-  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>
-</use>
+	<maintainer>
+		<email>dirtyepic@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+	<herd>pda</herd>
+	<longdescription lang="en">
+		Barry is a utility for synchronization, backup, restore,
+		program management, and charging of BlackBerry devices.
+	</longdescription>
+	<use>
+		<flag name='boost'>Enable boost support</flag>
+		<flag name='gui'>Install the GUI backup tool</flag>
+		<flag name='opensync'>Install the barry-sync plugin for OpenSync 0.22</flag>
+	</use>
 </pkgmetadata>