old

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

7 files changed, 15 insertions, 281 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index e243887d722d..dbef1bdabcb9 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.24 2012/10/03 15:39:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.25 2012/10/03 16:15:44 ssuominen Exp $
+
+  03 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/10-blackberry.rules, -barry-0.16.ebuild,
+  -files/barry-0.16-gcc45.patch, -barry-0.17.1.ebuild,
+  -files/blacklist-berry_charge.conf:
+  old
 
   03 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> barry-0.17.1-r1.ebuild,
   +files/barry-0.17.1-gcc47.patch:
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index dfe2d62c8796..2e024703890c 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10-blackberry.rules 1983 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a SHA512 d4186d6ad3df049ebc4120e17192e8b8393121aa9be22fd0403fcce65edcc06815a8c23c4f814a701e85e48ddd73b660c48cbd07d192ec1e609d7627bac2e085 WHIRLPOOL 40cddbf3b44450ba3adac2aef17eebb182bfda6a65f2563cdacb71281f2c4fd40dab112168aa03c159ed0834aa87d4717241ea7d72b4d2983d6cf14f2b3d2f29
-AUX barry-0.16-gcc45.patch 310 SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6 SHA512 83fdde7a6baf58b8d19a9227f7a333df05b06d1efef91f15e7bfe86dbea9fd72ece05a407f3c61dfcfba12061b2a298f5408ef08644cafc82d5291d555779e3c WHIRLPOOL 34bd7c7fe10e1e4600c0ad537588c84c2611b633010eab67f550550daac7dac0961ce7a0b052bf8b725ae8a42da7a62abb49c24f6a5a41582b53cb9e3a5dc0ee
 AUX barry-0.17.1-gcc47.patch 982 SHA256 961a4ed6b0d33a06b6fb32c47d66911ba9b3fa22832480afaa4941d71058a2df SHA512 27484bdbec3ec2daf745eba75347719ff00f1049099ab5d84d0727b262396fb24a2ce8e66f71a63752ece66cdfbbccc9a87dbdf727ec526a4b95e6228cb7b470 WHIRLPOOL 0c1d21f4b902871c9381b99f1be3ca1c035129153b899115dbe750cb1d5a0dc35a6014b5b285c590afddfba7c23a37453b494acf243bdacd4fda6a17374839db
-AUX blacklist-berry_charge.conf 65 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e SHA512 515ddded3d8dd4d1aebc9543b4fbb6f5b5096729fe5bcc06c6f0ae3702b5399640dfefcbc448517babb692765a9504ca356cd7027e5861d60427f9e8099d535e WHIRLPOOL 71b2c131ecf107028ea424528a7ebd9411abd83a4394dffd2801dbfe60aa1905eae0490ccd2c56c82f1ef83b85fa27199df29775c1be61e5edbee8c453db2864
-DIST barry-0.16.tar.bz2 4981342 SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220 SHA512 7bc39312367e3d95a10e34a0d8ef366a631efcc925ec45213b5863ae71b8f893a40d7ff1e4f6b3971ad76b83b66e41f2c8f7133e30ccffce2cad715822b8228f WHIRLPOOL ef61e2303f58347a5a91f352e15f0623c5aa6bf69efef30514d2616c9ff6500b6b61eb49beeb760546775c7d60cbc5095b85b5c5b17e03b4bf16d8c09d31b2ff
 DIST barry-0.17.1.tar.bz2 7618810 SHA256 8bff44bc0ff88aee6bb55d50c5dc84949c92f01841304833da4a50ab171e34ae SHA512 a2c96d4c0123a72d3889f0092ee90c748827453455be9a9b22e6e3f3c3d99e33b7547a9c32c6898d311919230969a8b8e7106d52b49301b2959464a2f5e1deff WHIRLPOOL 00ac326d1d42467a7ba4a92b9152fa656391624f9fe5b69c3374d90e0535d7c9202c961784c9433d4aa9d3121b95635b1fd1de29dd6db83110048149d3c6a16f
-EBUILD barry-0.16.ebuild 2345 SHA256 4d0f7b198d93a7b97439ba7c982c76bc57243ad8b22ddb8927280ebd9735e633 SHA512 a8f45ecba4cd1be0e8b5d0e29fc3cce8eb1b6355b11c6f37e44e216649743c30d1efc3e79d0f2d0d9a45e1755f2c7c8b832ac38b6f2556c062fd0a7dd2bb1584 WHIRLPOOL c1a6a4ed1f420f58e41e1ab38d026bc6bf7f870170c302c862ac6958732e2513972795382d5a5039f5565a26f504bf6698a4f0532e7dfc3fd9d7b3cc6bd80b49
 EBUILD barry-0.17.1-r1.ebuild 2760 SHA256 5828dca215c0511ef373d14265b6455b41ea9a4c2a8da6807fa2dbb31af678f2 SHA512 03deff9af6bf24c97673f67c54a061152e3055e5663eef242a02f28e65581e60d49c62006b1abe32de740d96f9fc52bddc9833a353616d3c8b0bab08b1442024 WHIRLPOOL a26cf5acbd256a4e6efd20e48a3bf46bf70600f584a0f6c0d82ca74b3cd3353852eac05e88cbf7a5d0a5878440de96b9d5b5ab1c67c6629cb2983d452afe0475
-EBUILD barry-0.17.1.ebuild 2584 SHA256 c19bb93b9efeeb52c36507b03634867258ea63bc60524b2724bd2a1df3fa9477 SHA512 68e635712fbb1cbe9d7e2deefe04190d71a45f775bdc9292de8ed006abea844284a9c825bdfd9323e60149ff21357fdd34f383b8508182ee8e70d8ac7e5cc3e6 WHIRLPOOL 4a7ae3b0aeba2c897dc5b57143e4c0abe389f3fbf6891e318f10275ade92c7193a96a10567e9f22f5d775f2092eff5ea09e9b3d2b4dde1b57138b92551354938
-MISC ChangeLog 4336 SHA256 0f5569e18051ee471b1cf10abb90896a3d1414f95b91c3e9bf58956bc38d1f0c SHA512 e45a672a63173b7cf334e0ad7ffe28e7598453c4c4b87de174c849fc10ec016c9ec9d8702c0a63affc9f5db5434fa20525f568170a3957787d1e68d031cbac4b WHIRLPOOL b673cc636af4e83c4dca6a6980fa487c3f4397b1bb8f088162bce0b2d6f1130d44bd4cd448bdc3a57c18adf2aea1f10fc480a528bde9f0110844bcd365e49597
+MISC ChangeLog 4540 SHA256 39af9dae27ac0a854da99f19dde1ce8df45172e2025673e6c33a02c25230d65d SHA512 330ea598262ed05bf1da2b049459cd10cde9a765b5cfc9edbd02f5be806a6ef8c6e00d313da31ee6557cfba6ea1729c8279d9afb7b88bf12644d1215f9ace347 WHIRLPOOL 4156950830e8eeb6177f2b1755896284e0f91749a18f2f71f9f210de5084abe520f4381f2ce7bd4a5b7cd62d636e606fe2339e89fe54f40c239cc4d4e2c06b05
 MISC metadata.xml 612 SHA256 d2bbc5b8ee764c1bc941bc5375bc3d868ef3d697e86acf6e1ed3b9addeaffcf4 SHA512 c6800b09d94d87786e0ed9bdbc6c1f9759763aae5668fb2878e2c7ebe2a102c8e9feb9f8181966dace44681a81104b2c2d497ea2b4bc065d1da1f89cef16bb2f WHIRLPOOL 4ae3c8be0d94d98c75f6187670fc6193bc8f91e7a487357dec5c80fc65d58d58632b34ada2713785a0c275ed2b4286bb779483a162ec177c829ec436396d9385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbFuFAAoJEEdUh39IaPFN6BsH/3zMYDePNITm48Hwq7O4+pMS
-v4lTUab1whMn1om5VaP9UA8CqqA6cWOGRcL2Wz3j3gDCb0BvttDXSAsTHTzoHv57
-2HtnuYo84eZvZlV/CCxcVsw3jOQNvBWygoXVdUhz7J1x395sMRScl2fz/Ywxp/k6
-1n6QRFb1Fgn4R7+7kS5VY2r2VSzaT+smj2vQjgBIVy+hHl7wsFg+kKT/XGtIPJ6+
-XwGJF9IHN2spVYewEZRVQUIvfbTJerLpVpZQsjGSIoEi10ehA4E5zpOH8miwpsyJ
-q3fYZbyx94KE8/BCl7rPtkYgoTXB6FoXUdVvUhExVeeBZYICgQFpIwgWczfgb9w=
-=GZDq
+iQEcBAEBCAAGBQJQbGQgAAoJEEdUh39IaPFNUa4IAKAw3j+PEoI1yzl0wIJluaDI
+3YJwn0y3Lf5IhWaI2Ut23lCm/MuF2CAMK+tEllvpND0nQGadbkEjyBbDJxM8lKoh
+bKqSJ2Flv36UdP44aRLC5hay0daBKmIqhgIxXjxSTxMv8ownUvw/sl5fguikSd/b
+IO/vMUqn1fvvKbNibnjsfQtMZYnDc7e+80xzGHVhpnC2aGy5F3PivD/hGEhgvV+U
+F0Gq0bmixv0ndZenxpwzBhIrGGzocINluajmjpcVgTDVNSNIYpkZ7SEdCVWrqBFq
+ym1F9AoADvmjDHvzRX/xm4cLMaW5T4KHaWaF7fYIUNZzI5tdn6fJvBU7qyrrp3k=
+=dwRU
 -----END PGP SIGNATURE-----
diff --git a/app-pda/barry/barry-0.16.ebuild b/app-pda/barry/barry-0.16.ebuild
deleted file mode 100644
index 4a6310ac3185..000000000000
--- a/app-pda/barry/barry-0.16.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.16.ebuild,v 1.13 2012/05/22 16:39:13 ssuominen Exp $
-
-EAPI="3"
-
-inherit 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"
-
-RDEPEND="virtual/libusb:0
-	dev-libs/openssl
-	sys-libs/zlib
-	boost?	( >=dev-libs/boost-1.33 )
-	gui?	( >=dev-cpp/gtkmm-2.4:2.4
-			  >=dev-cpp/libglademm-2.4:2.4
-			  >=dev-cpp/glibmm-2.4:2
-			  >=dev-libs/libtar-1.2.11-r2 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc?	( >=app-doc/doxygen-1.5.6 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-	sed -i -e '/bdptest_LDADD =/ s:\(.*\):\1 ../src/libbarry.la:' tools/Makefile.in
-	# Think twice about running eautoreconf here.  Upstream seems to like
-	# patching the generated files directly and the sources don't remotely
-	# match anymore.  See bug #319795.
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable gui) \
-		$(use_with gui libtar /usr) \
-		$(use_with gui libz) \
-		--disable-opensync-plugin
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd "${S}"
-		doxygen
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-
-	if use doc; then
-		dohtml doc/www/doxygen/html/*  || die
-	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.conf blacklist-berry_charge.conf
-
-	#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.17.1.ebuild b/app-pda/barry/barry-0.17.1.ebuild
deleted file mode 100644
index 3367a81752b7..000000000000
--- a/app-pda/barry/barry-0.17.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.17.1.ebuild,v 1.3 2012/05/22 16:39:13 ssuominen 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
-	virtual/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}
-	virtual/pkgconfig
-	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/files/10-blackberry.rules b/app-pda/barry/files/10-blackberry.rules
deleted file mode 100644
index c92ac684209e..000000000000
--- a/app-pda/barry/files/10-blackberry.rules
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# 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.16-gcc45.patch b/app-pda/barry/files/barry-0.16-gcc45.patch
deleted file mode 100644
index 0f9be0a58fb5..000000000000
--- a/app-pda/barry/files/barry-0.16-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318583
-
---- src/j_message.h
-+++ src/j_message.h
-@@ -31,7 +31,7 @@
- private:
- 	int m_socket;
- 
--	JDWP::JDWP m_jdwp;
-+	JDWP m_jdwp;
- 
- 	void RawSend(Barry::Data &send, int timeout = -1);
- 	bool RawReceive(Barry::Data &receive, int timeout = -1);
diff --git a/app-pda/barry/files/blacklist-berry_charge.conf b/app-pda/barry/files/blacklist-berry_charge.conf
deleted file mode 100644
index 1ba982bb7e58..000000000000
--- a/app-pda/barry/files/blacklist-berry_charge.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# conflicts with Barry's bcharge utility
-blacklist berry_charge
-