old

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 5 insertions, 150 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index e0cce680e76c..c0d920a79058 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.30 2013/02/07 21:40:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.31 2013/03/27 05:24:30 ssuominen Exp $
+
+  27 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> -barry-0.17.1-r1.ebuild,
+  -files/barry-0.17.1-gcc47.patch:
+  old
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> barry-0.18.3.ebuild:
   Move Creative Commons licenses to shorter names.
diff --git a/app-pda/barry/barry-0.17.1-r1.ebuild b/app-pda/barry/barry-0.17.1-r1.ebuild
deleted file mode 100644
index 8b46066ffaff..000000000000
--- a/app-pda/barry/barry-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,108 +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-r1.ebuild,v 1.4 2012/12/11 15:54:56 axs Exp $
-
-EAPI="4"
-
-inherit autotools-utils bash-completion eutils udev toolchain-funcs
-
-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 )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
-
-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
-	udev_dorules "${S}"/udev/10-blackberry.rules
-#	udev_dorules "${S}"/udev/69-blackberry.rules
-	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
-	udev_dorules "${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/barry-0.17.1-gcc47.patch b/app-pda/barry/files/barry-0.17.1-gcc47.patch
deleted file mode 100644
index 0ea1960263f6..000000000000
--- a/app-pda/barry/files/barry-0.17.1-gcc47.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c0daafaf990f014b811bad103e9b9b205bd7e378 Mon Sep 17 00:00:00 2001
-From: Nathanael Noblet <nathanaelnoblet@gmail.com>
-Date: Thu, 5 Jan 2012 18:25:59 -0500
-Subject: [PATCH] lib: added unistd.h includes for gcc 4.7
-
-Fedora 17 will include gcc-4.7 and as such the packages have all been
-rebuilt. Barry failed because of a change in gcc. The following patch fixes
-the issue.
----
- src/j_jdwp.cc |    2 +-
- src/packet.h  |    1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/j_jdwp.cc b/src/j_jdwp.cc
-index 875f226..279e61c 100644
---- a/src/j_jdwp.cc
-+++ b/src/j_jdwp.cc
-@@ -24,7 +24,7 @@
- #include <sstream>
- #include <iomanip>
- #include <errno.h>
--
-+#include <unistd.h>
- 
- namespace Barry { namespace JDWP {
- 
-diff --git a/src/packet.h b/src/packet.h
-index a89cf1d..52f16f2 100644
---- a/src/packet.h
-+++ b/src/packet.h
-@@ -26,6 +26,7 @@
- 
- #include <string>
- #include <stdint.h>
-+#include <unistd.h>
- #include "protocol.h"
- #include "data.h"
- 
--- 
-1.6.5.GIT
-