pesa 15/06/04 18:04:11 Modified: tinymount-0.2.8.ebuild ChangeLog Log: Fix bug 551202, plus various other enhancements to the ebuild. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.2 x11-misc/tinymount/tinymount-0.2.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild?r1=1.1&r2=1.2 Index: tinymount-0.2.8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinymount-0.2.8.ebuild 3 Feb 2015 05:54:47 -0000 1.1 +++ tinymount-0.2.8.ebuild 4 Jun 2015 18:04:11 -0000 1.2 @@ -1,30 +1,30 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild,v 1.1 2015/02/03 05:54:47 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/tinymount/tinymount-0.2.8.ebuild,v 1.2 2015/06/04 18:04:11 pesa Exp $ EAPI=5 -unset _live_inherits PLOCALES="ru uk" +inherit l10n qt4-r2 -if [[ ${PV} == *9999* ]]; then - _live_inherits="git-2" - EGIT_REPO_URI="git://github.com/limansky/${PN}.git" +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI=("https://github.com/limansky/${PN}.git";) + inherit git-r3 else SRC_URI="https://github.com/limansky/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -inherit l10n qt4-r2 ${_live_inherits} - -DESCRIPTION="Simple disk mount utility" -HOMEPAGE="http://github.com/limansky/tinymount"; +DESCRIPTION="Simple graphical utility for disk mounting" +HOMEPAGE="https://github.com/limansky/tinymount"; LICENSE="GPL-2" SLOT="0" IUSE="debug libnotify" -COMMON_DEPEND="dev-qt/qtgui:4 +COMMON_DEPEND=" + dev-qt/qtcore:4 dev-qt/qtdbus:4 + dev-qt/qtgui:4 libnotify? ( x11-libs/libnotify )" DEPEND="${COMMON_DEPEND} virtual/pkgconfig" @@ -35,24 +35,23 @@ src_prepare() { remove_locale() { - # this is nonfatal sed, so '|| die' unneeded here - sed -i -e "/TRANSLATIONS/s/translations\/${PN}_${1}.ts//" src/src.pro + sed -i -e "/translations\/${PN}_${1}.ts/d" src/src.pro || die } # Check for locales added/removed from previous version - l10n_find_plocales_changes "src/translations" "${PN}_" '.ts' + l10n_find_plocales_changes src/translations "${PN}_" .ts # Prevent disabled locales from being built l10n_for_each_disabled_locale_do remove_locale - # bug #441986 - sed -i src/src.pro -e 's|-Werror||g' || die # bug #441986 + # Bug 441986 + sed -i -e 's|-Werror||g' src/src.pro || die qt4-r2_src_prepare } src_configure() { - local params="PREFIX=/usr" - use libnotify && params="${params} CONFIG+=with_libnotify" - eqmake4 ${params} + eqmake4 \ + PREFIX="${EPREFIX}/usr" \ + $(use libnotify && echo CONFIG+=with_libnotify) } 1.9 x11-misc/tinymount/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/ChangeLog?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/ChangeLog?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/tinymount/ChangeLog?r1=1.8&r2=1.9 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/tinymount/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ChangeLog 4 Jun 2015 16:54:48 -0000 1.8 +++ ChangeLog 4 Jun 2015 18:04:11 -0000 1.9 @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/tinymount # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/tinymount/ChangeLog,v 1.8 2015/06/04 16:54:48 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/tinymount/ChangeLog,v 1.9 2015/06/04 18:04:11 pesa Exp $ + + 04 Jun 2015; Davide Pesavento <[email protected]> tinymount-0.2.8.ebuild: + Fix bug 551202, plus various other enhancements to the ebuild. 04 Jun 2015; Davide Pesavento <[email protected]> -tinymount-0.2.6-r1.ebuild: old
