Split off libfm-extra to prevent circular dep with menu-cache. Add lxqt herd as co...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index f05946e0a6b8843ea25df20281abbc47986689ef..62830ef0cb5c1d4c3e1c4536183e6ed3e8e57979 100644 (file)
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2015/03/03 11:39:33 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.104 2015/03/06 12:44:59 yngwin Exp $
+
+*libfm-1.2.3-r1 (06 Mar 2015)
+
+  06 Mar 2015; Ben de Groot <yngwin@gentoo.org> +libfm-1.2.3-r1.ebuild,
+  metadata.xml:
+  Split off libfm-extra to prevent circular dep with menu-cache. Add lxqt herd
+  as co-maintainer.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> libfm-1.2.3.ebuild:
   add arm64 support, tested on A53 board

diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 5bcf528cfffafcdde3dd811e960313488c3a507e..caa8e635094394707889657495c63f37e5e07bee 100644 (file)
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -9,24 +9,27 @@ DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a9
 EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb98131e3112781e5f0de2106ca5588 SHA512 60400b6633ce414d29b6797904d1a3eacfb3d372e89cc765a822e92a2ba6f26294401d6989d0dd3a939b01572fcf5f89eedd6416ea15cfb2e8eed7cf45b99f90 WHIRLPOOL 05c0eb3b9813ccd33fa352e5904928e6f8fbd48a325832765a294a394de951bfa5fb2113cf3be7d786c743cddf8ad75b291bc9a5915d5a0de6083f7499f7b519
 EBUILD libfm-1.1.4.ebuild 3265 SHA256 a1d34a0c63898aac0d956b261d564fed9f72614ddf90228f92295eae5908cfdd SHA512 f79355b7fc0579043c86ff427fb81b1d446eaf60b65be8d464fb3c01b7baa5d1a8f98b77bd7ad8a940464652f98ed758d0546659ff917516856f3e0f5ddfc1ba WHIRLPOOL a79fd0d3a790e767f1cf8be2d4a8af74a12486813deb6d59c9531b7f808fa60c1b04cfbc0eebf256888965c895904f2db5991cee983631b883b40aae4b6af872
 EBUILD libfm-1.2.2.1.ebuild 3352 SHA256 4a1650ca297973ae994b1ed690745723777415dad985e90b522c0c3a70d118f0 SHA512 d03e54d1423f48a031a2360ccf751a4d31563d0be1dd956b8b1de2efa5001f0405cc3e1dce46066847157a3d4e78c77b76452cefcce63e9c5e822eecb59c0fcb WHIRLPOOL 9a78ba733a39c9a2013ac40151f31501fdb921b538318dd35b5bb72ec33945cf8fdfc17f414f26ba0689fe5761fb1dc7e70b396aaf871041d59d39b6c6a2b69d
+EBUILD libfm-1.2.3-r1.ebuild 3619 SHA256 f19aaa7f25fe56363dde31fd531c72adfeafe38027e08c9771f5e70e8cfd8257 SHA512 ca481d5ef5d58f309bcfd9fa53016c80385db7f5d81599724e236fa4377e38478e57eec2e6f2951177074f100e81b9a4a33dffcbf9f9ee12c8ca95ded4bae313 WHIRLPOOL cb1ef644b23841e27c41e08980f260d5fd0a86e073b9d6b48a2ea75c86084a5a8d99c2ee69f4f28baf9d55337c6cfb850aa43c0303b268559f72caef4c4d6052
 EBUILD libfm-1.2.3.ebuild 3358 SHA256 7686d20832ffaf878d6069e885a1742d7d75709227bca08da7e8690d6c37702d SHA512 4e2d03ed7dff0f3c467db7cd40273f60387ff32216c685eee7634598dc27a88e679f862fd88f0358f4883d9cf1cbd04265aaa44ebab1f052c2af3dd9e09a8ac3 WHIRLPOOL 879b73e21700b9dce440c2b2e65059ee6aac65e8afb70f9af27091e8d2cd323cdb413726aeb2acec4f7e8b490b08cf09986e8e6e1ecb441e46ae47a14b7b7501
 EBUILD libfm-9999.ebuild 3400 SHA256 365a23bfab8f2081b000c7548c1823a9b3547c735bf103cdc9cda2fb909907fc SHA512 f3f6a0b5ae141ad4862c211d6a491bdb38c575b3f58819ee59f9f21d8f1ea84cd125d92a5507df4e3f435437a9644909d550666d67545f6d2d8252b1edd42238 WHIRLPOOL 3c7a7f49ab323cbd3f41038d3912054e766adddfdfe49948222b0d3bafc4adf2d6008817b602cb6c791e30eab9cf70bca0b07f5656e1e8ef56293b16765d2f9c
-MISC ChangeLog 15097 SHA256 2750877d15bd2d275d56a8b78f26d0937bec0c6477f86657b6a4219bb5ea8c72 SHA512 193b1707bbe5b62e5df503df796c512ede7b8b180c66dd0cf3bfcd75a2b21e8e8234440b708414bf6f282cc2c1fedd154ac2fa2ffb2482de34b3d56fdaddc122 WHIRLPOOL 8b9e3e2f1f8bd60b9fffb2dd6ab90eb0ac4b0a51a5180c8b20303b45c25e4bbcd4c16a70a4e682dd981b1eabd0429d12b1c1cb92ac50d8285981300afe9b69b9
-MISC metadata.xml 530 SHA256 c6ecddb0ae185f3438900090b4b05ec36b7f707f62075c94fe58ff98ad718270 SHA512 25c7bee3c83d7c76e423d72d2848e253b8e604bb76727ad6ce5ca51dcc904e0d0e1cd6afca04b55a6ff9cc0dee6516273f607512b80d5bf04af01a57f26a3c50 WHIRLPOOL ef86e0d6864d8e62215dcf162bde85e0a0ff091f038290e1715f2f33c5f385e81b08df84755b67e55939c0080c614d7c964a984fc816052320a2445ad7d2b26b
+MISC ChangeLog 15318 SHA256 3408dcba310c05acef93347338436a6222c6d60e2ea97bd119bb864653f1408d SHA512 1676a2273ff246a15ac540a631874c09a597d9510e2edb5e7337c0708a16da2de515dbfc36fb342b1c6ded48c9f8927e0244c9a38e98a5e35bc83f90b2b641f7 WHIRLPOOL 362d8437ab392fb8f7fb1585bfffa33646b03a33809a36d420cfcc187074256c81a848cd3a8a14bf08bcd71a4a2b5160ccc50428baf5f808b8c6b360cac4c24a
+MISC metadata.xml 550 SHA256 777f55c45ede6755f2aa74dda3d91e4ebaf654fbb08c1d762e7a102c5457e695 SHA512 e8821f860387c9a55261547d3dfa360987b0e52afa8e69dca1003d8efc11758e76a82f40db69f06f93d74853f9bb8b6c9e442c1636e113b7be7d6e68ee99db86 WHIRLPOOL d1b20855d7e430c8952dac697ba91597cf90bac26681decdc6dfadae69a94f4a12390519d67802db96fb71a4148cb230d8e7a3c7e23a2cc135441eed922fcb66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU9SyYAAoJEJIMDbyqvv1VIhcP/13lcgNleV1oy0Sf0FDQgJY4
-s//VZdjZkrIkqO6WsDsz2wBoGCgaMuLidYFcIcShCjHzS4d9spgegrvN8xHlsXmP
-3DxX5rdoLfZVb9g+rYexxYZ/O7iYaQSPIi2P6w+vVVyjLhzSveoWP0tk1yk+YJc/
-TV4l+ANziGIJkChOBLnlDcEbWo/b3sZ62vXb5gPB7VWSOOgUd4GtyXz6nlnwNAiS
-5t6Rkf/WO9VzZx6IXe8tag9hHzyfyaYQxo51k9HnB0vBxkC4TJ7IM5dVLoBgxLGx
-2Vz+pDrWtM/rdgED5zxRs9aNCWTq8ZRTosQEEMz8sffDt4IIuIede8LJ2D6R2QrY
-vQfJfiJGT97ySwJEliEPVxgECGgqh0lLpWJdy80JwvrfeN4LveGHDrUTf6dmJ2GU
-yvx6TEqdRzbIMMyMrJ6Ouey8288mllo5ZmeZcpf3WjGqHckQFqvoXQ+t6EtPS0CG
-+AUaS8r3iaCFZ/f6IgNdrMpqfx1HZmBtWY0ARAkY7cttONqBjSiYjDCczOWx4mFg
-DA+hDxqxCZa75XgIPOKpgneEkTLZpRJ39XBDA6LUHBscilKInHmV7e0KJK1klCv7
-UZO8tHrGSIxCZ3hKaYmgCgljdirs9amW/zT/sKteAzbbOQlajmCiEQZfBgFunNQN
-VqiCanDnTI2cX8kgOx/X
-=mSiT
+iQJ8BAEBCABmBQJU+aFOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOcv8P/26t7qpzyTAY9RCne+d47afx
+aEK0Dxw5EGLKn6CzHa3MU2FJnm/GccGIrhyVu1kXbIZksW/Av//DLr4XR+EAWXMC
+p5pLE03mx4JgvFT5VqXw3SrTikGLxo0IzAy6VmFgbM/CEr48Ebgcr8z3zyBRPPAO
+3ZX5sJFOUmwS+YQJnm693II9vhXRY5DHkzzkrZFW0+3zQmNsevJnX7OEbmtl9QZa
+HEdeqlldIpKOZH01F7rAsrTn3Oqpf7Db6lxhdh3F7MLZEECWPa0VvaE6w00t8tB8
+GuEbedBad1RJaR8J/6nquAElBri0HjzPU99yRlMGyxqGVKBXVKRJtCL0PwOxUFHp
++5FGx0I5f4jmkxchk7o8CkgX8d3Muo65CJgDFnfSWcd6tZiMwWlAjgj2NrRt8iag
+KVY2je0ENpsrZPsRt8yvDKC1JlpGs0S//PhoSawXXfAcwpxnFtsL03YguGZRc6Wj
+ULqZGgTqmEQMEPDq/TDl26qDbOhHfgByEcw2Bs0tx8Pc9RWnIF2S5YEOSAUcTEpv
+xBsq1y/c7h16n7IFo9RBJRhYxSu/N7E09Rqcx5a1iQX6Ud+rtujIUxWDAbQBI4HX
+ZniLJ1BqZbNaFlTFM6lFJHbrC6GE9O0Yc5gi9PmxZMV8vrLjy6cbW90qlwXD3zqc
+23I32RuO60WIAiG8bFnC
+=dg1U
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
new file mode 100644 (file)
index 0000000..88e70b4
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
@@ -0,0 +1,125 @@
+# 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-1.2.3-r1.ebuild,v 1.1 2015/03/06 12:44:59 yngwin Exp $
+
+EAPI=5
+
+inherit autotools fdo-mime multilib 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 ~arm64 ~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:=
+       ~x11-libs/libfm-extra-${PV}"
+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
+       # 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() {
+       # 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
+}

diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index a47d8cea7b86956187b4879626543f787cb89198..462a8c8ac57094dbccf7354f8ffc3446d82e0ced 100644 (file)
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -6,6 +6,7 @@
   <email>hwoarang@gentoo.org</email>
   <name>Markos Chandras</name>
   </maintainer>
+  <herd>lxqt</herd>
   <use>
        <flag name='vala'>Support custom actions in menus</flag>
        <flag name='udisks'>Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>