old

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

6 files changed, 7 insertions, 267 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/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
-