[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: 3ebfdacc4f099589ae361b12bdd5ee70c2abdf33
Author: David Seifert gentoo org>
AuthorDate: Fri Jul 16 23:11:46 2021 +
Commit: David Seifert gentoo org>
CommitDate: Fri Jul 16 23:11:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebfdacc
app-pda/barry: Port to EAPI 7
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
app-pda/barry/barry-0.18.3.ebuild | 70 +--
1 file changed, 31 insertions(+), 39 deletions(-)
diff --git a/app-pda/barry/barry-0.18.3.ebuild
b/app-pda/barry/barry-0.18.3.ebuild
index 0709efae039..2162d8fc9d8 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit bash-completion-r1 desktop epatch flag-o-matic gnome2-utils udev
+inherit bash-completion-r1 desktop udev xdg
DESCRIPTION="Sync, backup, program management, and charging for BlackBerry
devices"
HOMEPAGE="http://www.netdirect.ca/software/packages/barry/";
@@ -12,53 +12,58 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="boost doc gui nls static-libs"
+IUSE="boost doc gui nls"
-RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
+RDEPEND="
+ >=dev-cpp/libxmlpp-2.6: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 )
+ boost? ( dev-libs/boost:= )
gui? (
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
dev-cpp/libglademm:2.4
- )"
-DEPEND="${RDEPEND}
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
doc? ( >=app-doc/doxygen-1.5.6 )
nls? ( >=sys-devel/gettext-0.18.1.1 )"
-DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch )
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
-
- append-cxxflags -std=c++11
+ default
- sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
- sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
+ sed -e 's:plugdev:usb:g' -i udev/99-blackberry-perms.rules || die
+ sed -e '/Icon/s:=.*:=barry:' -i menu/*.desktop || die
}
src_configure() {
econf \
$(use_enable nls) \
- $(use_enable static-libs static) \
$(use_enable boost) \
$(use_enable gui) \
--disable-desktop \
- --disable-rpath
+ --disable-rpath \
+ --disable-static
}
src_compile() {
default
if use doc; then
- cd "${S}"
doxygen || die
+ # clean out cruft
+ find doc/www/doxygen/html/ \( \
+ -iname '*.map*' -o \
+ -iname '*.md5' -o \
+ -iname '*.php' -o \
+ -iname '*.sh' \) -delete || die
fi
}
@@ -66,39 +71,26 @@ 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/*
+ dodoc KnownBugs
+ use doc && dodoc -r doc/www/doxygen/html
+ rm -rf doc/www || die
+ dodoc -r doc/.
# Skipping different (old Fedora) rules 69-blackberry.rules in purpose
- udev_dorules "${S}"/udev/10-blackberry.rules
"${S}"/udev/99-blackberry-perms.rules
+ udev_dorules udev/10-blackberry.rules udev/99-blackberry-perms.rules
# blacklist for BERRY_CHARGE kernel module
insinto /lib/modprobe.d
- doins "${S}"/modprobe/blacklist-berry_charge.conf
+ doins modprobe/blacklist-berry_charge.conf
# pppd options files
docinto ppp
- dodoc "${S}"/ppp/*
+ dodoc -r ppp/.
- dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
+ dobashcomp bash/btool bash/bjavaloader
- newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
- use gui && domenu "${S}"/menu/barrybackup.desktop
+ newicon -s scalable logo/${PN}_logo_icon.svg ${PN}.svg
+ use gui && domenu menu/barrybackup.desktop
find "${ED}" -name '*.la' -delete || die
}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: f54a644da95af0a74c230c8df81d6f7fdd37e103
Author: Pacho Ramos gentoo org>
AuthorDate: Thu Jun 28 21:18:23 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu Jun 28 21:18:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f54a644d
app-pda/barry: libgcal will be removed (#659532)
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-pda/barry/barry-0.18.3.ebuild | 18 --
app-pda/barry/metadata.xml| 1 -
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/app-pda/barry/barry-0.18.3.ebuild
b/app-pda/barry/barry-0.18.3.ebuild
index 48454eed302..6a672094e52 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,17 +11,16 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="boost desktop doc gui nls static-libs"
+IUSE="boost doc gui nls static-libs"
RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
- >=dev-libs/glib-2
+ 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
@@ -49,7 +48,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable boost) \
$(use_enable gui) \
- $(use_enable desktop) \
+ --disable-desktop \
--disable-rpath
}
@@ -86,7 +85,6 @@ src_install() {
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
@@ -98,14 +96,6 @@ pkg_preinst() {
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() {
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index dfc30d13b21..64b764c3d6c 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -7,7 +7,6 @@
Enable boost support
- Install the GUI desktop control
panel
Install the GUI backup tool
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: 4b239ea5e863bd00b1bca0ea5039667282645d5c Author: Pacho Ramos gentoo org> AuthorDate: Sat Mar 10 11:52:02 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sat Mar 10 12:21:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b239ea5 app-pda/barry: Update maintainer due to bug #143105 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-pda/barry/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml index 1b285889418..dfc30d13b21 100644 --- a/app-pda/barry/metadata.xml +++ b/app-pda/barry/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - rh...@gentoo.org - Ryan Hill - Barry is a utility for synchronization, backup, restore, program management, and charging of BlackBerry devices.
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: db8e7dbf593a9609aeb1c166ed84fffd0b5172bc Author: David Seifert gentoo org> AuthorDate: Sun Dec 10 14:11:57 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 10 14:16:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8e7dbf app-pda/barry: [QA] Fix dependency.missingslot Package-Manager: Portage-2.3.16, Repoman-2.3.6 app-pda/barry/barry-0.18.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild index 248e554676a..48454eed302 100644 --- a/app-pda/barry/barry-0.18.3.ebuild +++ b/app-pda/barry/barry-0.18.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -17,7 +17,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6 >=dev-libs/glib-2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2 - >=sys-fs/fuse-2.5 + >=sys-fs/fuse-2.5:= sys-libs/zlib virtual/libusb:1 boost? ( >=dev-libs/boost-1.33 )
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: 016e4233ba4282711082ed8ac9e6d78011fe3132 Author: Pacho Ramos gentoo org> AuthorDate: Wed Oct 12 18:50:31 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Oct 12 18:54:52 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016e4233 app-pda/barry: Set proper libxmlpp slot Package-Manager: portage-2.3.1 app-pda/barry/barry-0.18.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild index 0e72f70..24f1b7c 100644 --- a/app-pda/barry/barry-0.18.3.ebuild +++ b/app-pda/barry/barry-0.18.3.ebuild @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="boost desktop doc gui nls static-libs" -RDEPEND=">=dev-cpp/libxmlpp-2.6 +RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6 >=dev-libs/glib-2 >=dev-libs/libtar-1.2.11-r2 >=media-libs/libsdl-1.2
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/files/, app-pda/barry/
commit: ef9003abf6bfae6ec8ba8ee54a1bdc785a53f6f9
Author: Ryan Hill gentoo org>
AuthorDate: Tue Feb 16 23:50:46 2016 +
Commit: Ryan Hill gentoo org>
CommitDate: Tue Feb 16 23:51:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9003ab
app-pda/barry: Build with -std=c++11 for libsigc++ compatibility (bug #566910).
Package-Manager: portage-2.2.27
app-pda/barry/barry-0.18.3.ebuild | 8 ++--
app-pda/barry/files/barry-0.18.4-shared_ptr.patch | 25 +++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/app-pda/barry/barry-0.18.3.ebuild
b/app-pda/barry/barry-0.18.3.ebuild
index 09e88fb..0e72f70 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit bash-completion-r1 eutils gnome2-utils udev
+inherit bash-completion-r1 eutils flag-o-matic gnome2-utils udev
DESCRIPTION="Sync, backup, program management, and charging for BlackBerry
devices"
HOMEPAGE="http://www.netdirect.ca/software/packages/barry/";
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
+
+ append-cxxflags -std=c++11
+
sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
}
diff --git a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
new file mode 100644
index 000..dbccfe6
--- /dev/null
+++ b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch
@@ -0,0 +1,25 @@
+With -std=c++-11 shared_ptr is available in the standard library so pulling in
+the std::tr1 namespace creates an ambiguous reference. Simple fix is to stop
+doing that but isn't backwards compatible. We don't care in Gentoo since we'll
+always be building barry with -std=c++11 due to libsigc++ abi compatibility.
+
+--- a/tools/bio.cc
b/tools/bio.cc
+@@ -42,7 +42,6 @@
+ #include "i18n.h"
+
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+
+ // keeping a record of all the -i device / -o device pin numbers, so
+--- a/tools/btool.cc
b/tools/btool.cc
+@@ -59,7 +59,6 @@
+ #include "barrygetopt.h"
+
+ using namespace std;
+-using namespace std::tr1;
+ using namespace Barry;
+
+ std::map SortKeys;
[gentoo-commits] repo/gentoo:master commit in: app-pda/barry/
commit: 5e9bae037781691d8902110435aa66b4af072a46
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Nov 16 16:12:57 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Nov 18 12:48:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9bae03
app-pda/barry: remove opensync USE flag
opensync packages are being removed.
Gentoo-bug: 550234
Package-Manager: portage-2.2.24
app-pda/barry/barry-0.18.3.ebuild | 8 +++-
app-pda/barry/metadata.xml| 1 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/app-pda/barry/barry-0.18.3.ebuild
b/app-pda/barry/barry-0.18.3.ebuild
index 7fcd396..09e88fb 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="boost desktop doc gui opensync nls static-libs"
+IUSE="boost desktop doc gui nls static-libs"
RDEPEND=">=dev-cpp/libxmlpp-2.6
>=dev-libs/glib-2
@@ -27,8 +27,7 @@ RDEPEND=">=dev-cpp/libxmlpp-2.6
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 )
@@ -47,7 +46,6 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable boost) \
$(use_enable gui) \
- $(use_enable opensync opensync-plugin) \
$(use_enable desktop) \
--disable-rpath
}
diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml
index 2ac61ee..a6931b4 100644
--- a/app-pda/barry/metadata.xml
+++ b/app-pda/barry/metadata.xml
@@ -14,7 +14,6 @@
Enable boost support
Install the GUI desktop control
panel
Install the GUI backup tool
- Install the barry-sync plugin for
OpenSync 0.22
barry
