hwoarang    14/10/18 20:31:52

  Modified:             libfm-9999.ebuild ChangeLog
  Added:                libfm-1.2.3.ebuild
  Removed:              libfm-1.2.0.ebuild
  Log:
  Version bump. Bug #525516. Add gtk useflag per #517690. Rework gvfs deps
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with 
key 09BF4F54C2BA7F3C!)

Revision  Changes    Path
1.42                 x11-libs/libfm/libfm-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.42&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.42&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?r1=1.41&r2=1.42

Index: libfm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libfm-9999.ebuild   6 Sep 2014 08:41:06 -0000       1.41
+++ libfm-9999.ebuild   18 Oct 2014 20:31:52 -0000      1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.41 
2014/09/06 08:41:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.42 
2014/10/18 20:31:52 hwoarang Exp $
 
 EAPI=5
 
@@ -13,21 +13,18 @@
 HOMEPAGE="http://pcmanfm.sourceforge.net/";
 
 LICENSE="GPL-2"
-SLOT="0/4.2.0" #copy ABI_VERSION because it seems upstream change it randomly
-IUSE="+automount debug doc examples exif udisks vala"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
 KEYWORDS=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.18:2
-       >=x11-libs/gtk+-2.16:2
+       gtk? ( >=x11-libs/gtk+-2.16:2 )
        >=lxde-base/menu-cache-0.3.2:="
 RDEPEND="${COMMON_DEPEND}
        !lxde-base/lxshortcut
        x11-misc/shared-mime-info
        automount? (
-               udisks? ( || (
-                       gnome-base/gvfs[udev,udisks]
-                       gnome-base/gvfs[udev,gdu]
-               ) )
+               udisks? ( gnome-base/gvfs[udev,udisks] )
                !udisks? ( gnome-base/gvfs[udev] )
        )
        exif? ( media-libs/libexif )"
@@ -42,7 +39,7 @@
 
 DOCS=( AUTHORS TODO )
 
-REQUIRED_USE="udisks? ( automount )"
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
 
 src_prepare() {
        if ! use doc; then
@@ -90,6 +87,7 @@
                $(use_enable debug) \
                $(use_enable udisks) \
                $(use_enable vala actions) \
+               $(use_with gtk) \
                $(use_enable doc gtk-doc) \
                --with-html-dir=/usr/share/doc/${PF}/html
 }



1.102                x11-libs/libfm/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.102&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.102&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog   6 Sep 2014 08:41:06 -0000       1.101
+++ ChangeLog   18 Oct 2014 20:31:52 -0000      1.102
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.101 2014/09/06 
08:41:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.102 2014/10/18 
20:31:52 hwoarang Exp $
+
+*libfm-1.2.3 (18 Oct 2014)
+
+  18 Oct 2014; Markos Chandras <hwoar...@gentoo.org> +libfm-1.2.3.ebuild,
+  -libfm-1.2.0.ebuild, libfm-9999.ebuild:
+  Version bump. Bug #525516. Add gtk useflag per #517690. Rework gvfs deps
 
 *libfm-1.2.2.1 (06 Sep 2014)
 



1.1                  x11-libs/libfm/libfm-1.2.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild?rev=1.1&content-type=text/plain

Index: libfm-1.2.3.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.2.3.ebuild,v 1.1 
2014/10/18 20:31:52 hwoarang Exp $

EAPI=5

inherit autotools fdo-mime vala

MY_PV=${PV/_/}
MY_P="${PN}-${MY_PV}"
DESCRIPTION="A library for file management"
HOMEPAGE="http://pcmanfm.sourceforge.net/";
SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz";

KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-2"
SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
IUSE="+automount debug doc examples exif gtk udisks vala"

COMMON_DEPEND=">=dev-libs/glib-2.18:2
        gtk? ( >=x11-libs/gtk+-2.16:2 )
        >=lxde-base/menu-cache-0.3.2:="
RDEPEND="${COMMON_DEPEND}
        !lxde-base/lxshortcut
        x11-misc/shared-mime-info
        automount? (
                udisks? ( gnome-base/gvfs[udev,udisks] )
                !udisks? ( gnome-base/gvfs[udev] )
        )
        exif? ( media-libs/libexif )"
DEPEND="${COMMON_DEPEND}
        vala? ( $(vala_depend) )
        doc? (
                dev-util/gtk-doc
        )
        app-arch/xz-utils
        >=dev-util/intltool-0.40
        virtual/pkgconfig
        sys-devel/gettext"

S="${WORKDIR}"/${MY_P}

REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"

src_prepare() {
        if ! use doc; then
                sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed 
failed"
                sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
        fi
        sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
                configure.ac || die "sed failed"

        #disable unused translations. Bug #356029
        for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
                progress;do
                echo "data/ui/"${trans}.ui >> po/POTFILES.in
        done
        #Remove -Werror for automake-1.12. Bug #421101
        sed -i "s:-Werror::" configure.ac || die

        # subslot sanity check
        local sub_slot=${SLOT#*/}
        local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' 
src/Makefile.am | tr ':' '.')

        if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
                eerror "Ebuild sub-slot (${sub_slot}) does not match 
ABI_VERSION(${libfm_major_abi})"
                eerror "Please update SLOT variable as follows:"
                eerror "    SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
                eerror
                die "sub-slot sanity check failed"
        fi

        eautoreconf
        rm -r autom4te.cache || die
        use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
}

src_configure() {
        econf \
                --sysconfdir="${EPREFIX}/etc" \
                --disable-dependency-tracking \
                --disable-static \
                $(use_enable examples demo) \
                $(use_enable exif) \
                $(use_enable debug) \
                $(use_enable udisks) \
                $(use_enable vala actions) \
                $(use_with gtk) \
                $(use_enable doc gtk-doc) \
                --with-html-dir=/usr/share/doc/${PF}/html
}

src_install() {
        default
        find "${D}" -name '*.la' -exec rm -f '{}' +
        # 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
}

pkg_preinst() {
        # Resolve the symlink mess. Bug #439570
        [[ -d "${ROOT}"/usr/include/${PN} ]] && \
                rm -rf "${ROOT}"/usr/include/${PN}
        if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
                cd "${D}"/usr/include
                ln -s --force ${PN}-1.0 ${PN}
        fi
}

pkg_postinst() {
        fdo-mime_mime_database_update
}

pkg_postrm() {
        fdo-mime_mime_database_update
}




Reply via email to