commit: 3ebfdacc4f099589ae361b12bdd5ee70c2abdf33 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Jul 16 23:11:46 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Jul 16 23:11:46 2021 +0000 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 <soap <AT> 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 -}
