hwoarang 15/05/17 10:20:35 Modified: libfm-9999.ebuild ChangeLog Log: Update live ebuild. Move it to git-r3 and sync it with the regular ebuilds (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Revision Changes Path 1.43 x11-libs/libfm/libfm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.43&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.43&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?r1=1.42&r2=1.43 Index: libfm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- libfm-9999.ebuild 18 Oct 2014 20:31:52 -0000 1.42 +++ libfm-9999.ebuild 17 May 2015 10:20:35 -0000 1.43 @@ -1,13 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.42 2014/10/18 20:31:52 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.43 2015/05/17 10:20:35 hwoarang Exp $ EAPI=5 EGIT_REPO_URI="https://github.com/lxde/${PN}"; -# master seems way too unstable for us to use -EGIT_BRANCH="1.1" -inherit autotools git-2 fdo-mime vala +inherit autotools git-r3 fdo-mime vala DESCRIPTION="A library for file management" HOMEPAGE="http://pcmanfm.sourceforge.net/"; @@ -19,7 +17,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.18:2 gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:=" + >=lxde-base/menu-cache-0.3.2:= + x11-libs/libfm-extra" RDEPEND="${COMMON_DEPEND} !lxde-base/lxshortcut x11-misc/shared-mime-info @@ -95,13 +94,16 @@ src_install() { default find "${D}" -name '*.la' -exec rm -f '{}' + - # Remove broken symlink #439570 # Sometimes a directory is created instead of a symlink. No idea why... # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm # symlink to it. if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then rm -r "${D}"/usr/include/${PN} fi + # Remove files installed by split-off libfm-extra package + rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h + rm "${D}"/usr/$(get_libdir)/libfm-extra* + rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc } pkg_preinst() { 1.109 x11-libs/libfm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.109&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.109&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?r1=1.108&r2=1.109 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- ChangeLog 2 Apr 2015 20:03:59 -0000 1.108 +++ ChangeLog 17 May 2015 10:20:35 -0000 1.109 @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/libfm # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.108 2015/04/02 20:03:59 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.109 2015/05/17 10:20:35 hwoarang Exp $ + + 17 May 2015; Markos Chandras <hwoar...@gentoo.org> libfm-9999.ebuild: + Update live ebuild. Move it to git-r3 and sync it with the regular ebuilds 02 Apr 2015; Markus Meier <mae...@gentoo.org> libfm-1.2.3.ebuild: arm stable, bug #542042
