| 1 |
commit: 3ebfdacc4f099589ae361b12bdd5ee70c2abdf33 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 16 23:11:46 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 16 23:11:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ebfdacc |
| 7 |
|
| 8 |
app-pda/barry: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
app-pda/barry/barry-0.18.3.ebuild | 70 +++++++++++++++++---------------------- |
| 14 |
1 file changed, 31 insertions(+), 39 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild |
| 17 |
index 0709efae039..2162d8fc9d8 100644 |
| 18 |
--- a/app-pda/barry/barry-0.18.3.ebuild |
| 19 |
+++ b/app-pda/barry/barry-0.18.3.ebuild |
| 20 |
@@ -1,9 +1,9 @@ |
| 21 |
# Copyright 1999-2021 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI=5 |
| 25 |
+EAPI=7 |
| 26 |
|
| 27 |
-inherit bash-completion-r1 desktop epatch flag-o-matic gnome2-utils udev |
| 28 |
+inherit bash-completion-r1 desktop udev xdg |
| 29 |
|
| 30 |
DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices" |
| 31 |
HOMEPAGE="http://www.netdirect.ca/software/packages/barry/" |
| 32 |
@@ -12,53 +12,58 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2" |
| 33 |
LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
-IUSE="boost doc gui nls static-libs" |
| 37 |
+IUSE="boost doc gui nls" |
| 38 |
|
| 39 |
-RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6 |
| 40 |
+RDEPEND=" |
| 41 |
+ >=dev-cpp/libxmlpp-2.6:2.6 |
| 42 |
dev-libs/glib:2 |
| 43 |
>=dev-libs/libtar-1.2.11-r2 |
| 44 |
>=media-libs/libsdl-1.2 |
| 45 |
>=sys-fs/fuse-2.5:= |
| 46 |
sys-libs/zlib |
| 47 |
virtual/libusb:1 |
| 48 |
- boost? ( >=dev-libs/boost-1.33 ) |
| 49 |
+ boost? ( dev-libs/boost:= ) |
| 50 |
gui? ( |
| 51 |
dev-cpp/glibmm:2 |
| 52 |
dev-cpp/gtkmm:2.4 |
| 53 |
dev-cpp/libglademm:2.4 |
| 54 |
- )" |
| 55 |
-DEPEND="${RDEPEND} |
| 56 |
+ )" |
| 57 |
+DEPEND="${RDEPEND}" |
| 58 |
+BDEPEND=" |
| 59 |
virtual/pkgconfig |
| 60 |
doc? ( >=app-doc/doxygen-1.5.6 ) |
| 61 |
nls? ( >=sys-devel/gettext-0.18.1.1 )" |
| 62 |
|
| 63 |
-DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO ) |
| 64 |
+PATCHES=( "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch ) |
| 65 |
|
| 66 |
src_prepare() { |
| 67 |
- epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch |
| 68 |
- |
| 69 |
- append-cxxflags -std=c++11 |
| 70 |
+ default |
| 71 |
|
| 72 |
- sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die |
| 73 |
- sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die |
| 74 |
+ sed -e 's:plugdev:usb:g' -i udev/99-blackberry-perms.rules || die |
| 75 |
+ sed -e '/Icon/s:=.*:=barry:' -i menu/*.desktop || die |
| 76 |
} |
| 77 |
|
| 78 |
src_configure() { |
| 79 |
econf \ |
| 80 |
$(use_enable nls) \ |
| 81 |
- $(use_enable static-libs static) \ |
| 82 |
$(use_enable boost) \ |
| 83 |
$(use_enable gui) \ |
| 84 |
--disable-desktop \ |
| 85 |
- --disable-rpath |
| 86 |
+ --disable-rpath \ |
| 87 |
+ --disable-static |
| 88 |
} |
| 89 |
|
| 90 |
src_compile() { |
| 91 |
default |
| 92 |
|
| 93 |
if use doc; then |
| 94 |
- cd "${S}" |
| 95 |
doxygen || die |
| 96 |
+ # clean out cruft |
| 97 |
+ find doc/www/doxygen/html/ \( \ |
| 98 |
+ -iname '*.map*' -o \ |
| 99 |
+ -iname '*.md5' -o \ |
| 100 |
+ -iname '*.php' -o \ |
| 101 |
+ -iname '*.sh' \) -delete || die |
| 102 |
fi |
| 103 |
} |
| 104 |
|
| 105 |
@@ -66,39 +71,26 @@ src_install() { |
| 106 |
default |
| 107 |
|
| 108 |
# docs |
| 109 |
- rm -rf "${S}"/doc/www/*.{php,sh} |
| 110 |
- find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} + |
| 111 |
- use doc && dohtml "${S}"/doc/www/doxygen/html/* |
| 112 |
- rm -rf "${S}"/doc/www |
| 113 |
- dodoc -r "${S}"/doc/* |
| 114 |
+ dodoc KnownBugs |
| 115 |
+ use doc && dodoc -r doc/www/doxygen/html |
| 116 |
+ rm -rf doc/www || die |
| 117 |
+ dodoc -r doc/. |
| 118 |
|
| 119 |
# Skipping different (old Fedora) rules 69-blackberry.rules in purpose |
| 120 |
- udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules |
| 121 |
+ udev_dorules udev/10-blackberry.rules udev/99-blackberry-perms.rules |
| 122 |
|
| 123 |
# blacklist for BERRY_CHARGE kernel module |
| 124 |
insinto /lib/modprobe.d |
| 125 |
- doins "${S}"/modprobe/blacklist-berry_charge.conf |
| 126 |
+ doins modprobe/blacklist-berry_charge.conf |
| 127 |
|
| 128 |
# pppd options files |
| 129 |
docinto ppp |
| 130 |
- dodoc "${S}"/ppp/* |
| 131 |
+ dodoc -r ppp/. |
| 132 |
|
| 133 |
- dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader |
| 134 |
+ dobashcomp bash/btool bash/bjavaloader |
| 135 |
|
| 136 |
- newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg |
| 137 |
- use gui && domenu "${S}"/menu/barrybackup.desktop |
| 138 |
+ newicon -s scalable logo/${PN}_logo_icon.svg ${PN}.svg |
| 139 |
+ use gui && domenu menu/barrybackup.desktop |
| 140 |
|
| 141 |
find "${ED}" -name '*.la' -delete || die |
| 142 |
} |
| 143 |
- |
| 144 |
-pkg_preinst() { |
| 145 |
- gnome2_icon_savelist |
| 146 |
-} |
| 147 |
- |
| 148 |
-pkg_postinst() { |
| 149 |
- gnome2_icon_cache_update |
| 150 |
-} |
| 151 |
- |
| 152 |
-pkg_postrm() { |
| 153 |
- gnome2_icon_cache_update |
| 154 |
-} |
Archives