Version bump wrt #442108 by "grey dot"

Package-Manager: portage-2.2.0_alpha147/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 130 insertions, 6 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index 0ac372d1332e..a1fd307208a3 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.28 2012/12/11 15:54:56 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.29 2012/12/17 09:04:32 ssuominen Exp $
+
+*barry-0.18.3 (17 Dec 2012)
+
+  17 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +barry-0.18.3.ebuild,
+  metadata.xml:
+  Version bump wrt #442108 by "grey dot"
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> barry-0.17.1-r1.ebuild:
   changed udev rules installations to use udev.eclass (a cleaner way to
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index bf0edcb09367..c5fccb308467 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -3,13 +3,19 @@ Hash: SHA256
 
 AUX barry-0.17.1-gcc47.patch 982 SHA256 961a4ed6b0d33a06b6fb32c47d66911ba9b3fa22832480afaa4941d71058a2df SHA512 27484bdbec3ec2daf745eba75347719ff00f1049099ab5d84d0727b262396fb24a2ce8e66f71a63752ece66cdfbbccc9a87dbdf727ec526a4b95e6228cb7b470 WHIRLPOOL 0c1d21f4b902871c9381b99f1be3ca1c035129153b899115dbe750cb1d5a0dc35a6014b5b285c590afddfba7c23a37453b494acf243bdacd4fda6a17374839db
 DIST barry-0.17.1.tar.bz2 7618810 SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae SHA512 a2c96d4c0123a72d3889f0092ee90c748827453455be9a9b22e6e3f3c3d99e33b7547a9c32c6898d311919230969a8b8e7106d52b49301b2959464a2f5e1deff WHIRLPOOL 00ac326d1d42467a7ba4a92b9152fa656391624f9fe5b69c3374d90e0535d7c9202c961784c9433d4aa9d3121b95635b1fd1de29dd6db83110048149d3c6a16f
+DIST barry-0.18.3.tar.bz2 3457451 SHA256 c9dc6d1790d00f5535bbc0777082cd303aa8ca2e4256f1b16cafda44be97ce2c SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd WHIRLPOOL c991b1239d8f4c40c7e61fb4af1e6dbadb9e47c793a8e232556b8a2d8d08ca7474607e5c2ac3a557d1aad007d3ff7a1f74041351813e7ff77a131dfaeeb95999
 EBUILD barry-0.17.1-r1.ebuild 2640 SHA256 0845beae84771a20fa88a29dec9b6828757e1b53338dacbdeeae6267e04c4f25 SHA512 baa8de2988d14fd866863ea01229d23fb55941b69aadc9ede1cd6f7fbb51449ff0a799300283805e87d5b396326ff1aec281adaf05c3e8597049991cc732a057 WHIRLPOOL 5fe58e25a45334008d9f68d3a6241da2c45d32712ac399d16be557baf58f1e06b0df8610728f7483a3d13cc876ae373a85be17a1f9f5641aa43b29277105a65a
-MISC ChangeLog 4810 SHA256 f86b1b63d2fe12fccd16f58c8a367b042099f45749f865b21891578787847152 SHA512 43e7a4ac15325631c531c04d33f473ebcf37979d7e551c0e4ab9d648cfe04845c2474522b6495ac95e255fe3431c17cfbfff84c39c975720e523a17d924ae44a WHIRLPOOL 9653f4577ac25a78ceccb69b8d2cb847317761267b543adecfe331cc48baf2e5daf9b94498dd6ecdf556f8b705ef4697756746b7cf31be6d97338626954a2742
-MISC metadata.xml 612 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4 SHA512 c6800b09d94d87786e0ed9bdbc6c1f9759763aae5668fb2878e2c7ebe2a102c8e9feb9f8181966dace44681a81104b2c2d497ea2b4bc065d1da1f89cef16bb2f WHIRLPOOL 4ae3c8be0d94d98c75f6187670fc6193bc8f91e7a487357dec5c80fc65d58d58632b34ada2713785a0c275ed2b4286bb779483a162ec177c829ec436396d9385
+EBUILD barry-0.18.3.ebuild 2831 SHA256 813da98137ea7c7f5980a0ac53373c92abdf4b3ce1b068120ac2d82014182849 SHA512 aa2cfc00b7d240707a4f0bdacbd9ebeae6892df5dd538826197ee28340d9de68eb73e049523bef53c6fe354706d0d5410992e00dace27ab55bdd48148dfbd146 WHIRLPOOL 949ad8d7064943e20bab7d2dc8b4212cccd2677bc775dacc71dd47f0546f4af96e15ec92bf5b1c4fbf4226bbd3097a02c12677ab7e5a640c6c4a525e8fbadb22
+MISC ChangeLog 4979 SHA256 3fc3f1b8a2d4052fc421a80c9356b5d1feea8808a00a6e6250d6702fe070569f SHA512 71f4f12db52155abe052b67b933a2b0bd0f4c72bc63c2de90a12b6e4d75bf5ababfcce7ccb2af50fdedac7d9ee9f653847d381c5db71cb473751f65779d1952f WHIRLPOOL 4a45d5bf6f3e300a62865816adfc19c60caa04de6e3afa6a34f6756b8a7f91fe4747075e8e791be478568d62176572826fcf3ea4ff6d640f46873f8e77585c82
+MISC metadata.xml 680 SHA256 285e310fca8e9022466d20ab317467a6f9286209589732fc183bc8f073b70196 SHA512 e8e05b7ca6de0af4e0dc1520910f5a1deb77011763e312d455dbda5c83961f0208375bc9433f345ae7e554c5c5f08bafc773030baba739ddd64d214b1f509194 WHIRLPOOL b4167f4ea6c08137628de2b97cad9a8a59c215a75ee37ed820696b80f87131505e25aca0d4fed7bb9c10860f8beebcb07f42948572db1799ed32c5ce1ef1a139
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHV14ACgkQ2ugaI38ACPDQYQD/cPZIZoBJQk+t7UIlMEhA1LcZ
-feVtQ564p51w126ZICkA/iqOgHf5mScHcLPrYt1Grl4RhE+GcAarc74hIS4mLXNO
-=cQ2g
+iQEcBAEBCAAGBQJQzuAuAAoJEEdUh39IaPFNtXIH/RnDd5pBdGCs+Kxco4b1JTA/
+LGI7sw4FSzVirF3VjBaIMDtQyLvTmZsz1zQQIsp04GSgl9m24WUim+xMA9A7FSzQ
+AtZoiZV1VIawmN8eRQhTR+mOJTrnbuN8IOR+WNfw79ucY8E6LS+/xO14mYSjE6tv
+mdvWnZ099kwxNQHnQn8k+mx9XiFwT8+TKo3IcKB40pmGDyTw7tl1XrPq1tPfKaG2
+SVEn5GOH1bd585Mn8nitODH8o25PLL9EeNaRa/4cQRDBzviU5GxPUzdS1/I3FHHr
+2mGK1RoJcQtt3RqPLfNYMLFnxVOunfLxcNwCOVldInxOPXlwbOpwY07covMLZIs=
+=WHlR
 -----END PGP SIGNATURE-----
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
new file mode 100644
index 000000000000..875646a90f75
--- /dev/null
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.18.3.ebuild,v 1.1 2012/12/17 09:04:32 ssuominen Exp $
+
+EAPI=5
+inherit bash-completion-r1 eutils gnome2-utils udev
+
+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="CCPL-Attribution-ShareAlike-3.0 GPL-2" #See logo/README for CCPL
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost desktop doc gui opensync nls static-libs"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.6
+	>=dev-libs/glib-2
+	>=dev-libs/libtar-1.2.11-r2
+	>=media-libs/libsdl-1.2
+	>=sys-fs/fuse-2.5
+	sys-libs/zlib
+	virtual/libusb:1
+	boost? ( >=dev-libs/boost-1.33 )
+	desktop? ( >=net-libs/libgcal-0.9.6 )
+	gui? (
+		dev-cpp/glibmm:2
+		dev-cpp/gtkmm:2.4
+		dev-cpp/libglademm:2.4
+		)
+	opensync? ( ~app-pda/libopensync-0.22 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.6 )
+	nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
+
+src_prepare() {
+	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
+	sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable boost) \
+		$(use_enable gui) \
+		$(use_enable nls) \
+		$(use_enable opensync opensync-plugin) \
+		--disable-rpath
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${S}"
+		doxygen || die
+	fi
+}
+
+src_install() {
+	default
+
+	# docs
+	rm -rf "${S}"/doc/www/*.{php,sh}
+	find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} +
+	use doc && dohtml "${S}"/doc/www/doxygen/html/*
+	rm -rf "${S}"/doc/www
+	dodoc -r "${S}"/doc/*
+
+	# Skipping different (old Fedora) rules 69-blackberry.rules in purpose
+	udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules
+
+	# blacklist for BERRY_CHARGE kernel module
+	insinto /lib/modprobe.d
+	doins "${S}"/modprobe/blacklist-berry_charge.conf
+
+	# pppd options files
+	docinto ppp
+	dodoc "${S}"/ppp/*
+
+	dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
+
+	newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
+	use desktop && domenu "${S}"/menu/barrydesktop.desktop
+	use gui && domenu "${S}"/menu/barrybackup.desktop
+
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Barry requires you to be a member of the \"usb\" group."
+	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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index cc518f83b800..66ddce891b74 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -12,6 +12,7 @@
 	</longdescription>
 	<use>
 		<flag name='boost'>Enable boost support</flag>
+		<flag name='desktop'>Install the GUI desktop control panel</flag>
 		<flag name='gui'>Install the GUI backup tool</flag>
 		<flag name='opensync'>Install the barry-sync plugin for OpenSync 0.22</flag>
 	</use>