Version bump

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 125 insertions, 17 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index f1c607d6efa9..fe340045508e 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.87 2013/08/17 11:55:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.88 2013/10/07 17:09:06 hwoarang Exp $
+
+*libfm-1.1.2.2 (07 Oct 2013)
+
+  07 Oct 2013; Markos Chandras <hwoarang@gentoo.org> +libfm-1.1.2.2.ebuild:
+  Version bump
 
   17 Aug 2013; Markos Chandras <hwoarang@gentoo.org> -libfm-1.0.1.ebuild,
   -libfm-1.0.2.ebuild, -libfm-1.0.ebuild, -libfm-1.1.0.ebuild:
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 3f0b9a5a0c77..3df767922565 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -4,29 +4,31 @@ Hash: SHA256
 AUX libfm-0.1.17-ssp-fix.patch 908 SHA256 f8fb5e8f6a712de882151f50a9a23d002b8719da5dff8be33a92cfea7c93b85e SHA512 2e7701bf501bdef33a2c91fa5d9bc9fbcb1edcbf7ced323fd6d499cc1971b75fafdc0ba57b538bff1ebb4d5ed65776cdef18962cdaec6a43ebb4aa8178facecd WHIRLPOOL d2056cd5984577a031e11fba9275a040f2c29ed3a49d624a7ea3d0b425ba16b3bdcfaf963117dda7b79beb1ab75822e492d2bd3885d4dda6f39e6fbbe8ef4268
 DIST libfm-0.1.17.tar.gz 874556 SHA256 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b SHA512 83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044 WHIRLPOOL c55471431e4130cf96412cf4943e993954139c319dd5434f1d718d9c0609a12bde3dbb8e43b889bb4cefd300e5073b59b4b8fe6eeb732d87d52d8a9d536733b4
 DIST libfm-1.1.0.tar.gz 1077445 SHA256 b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d SHA512 497c2c0b84022113ee1a1687f979394903b2b20415d884a99e59aea9fd86a2ed0ae404cf75c22e6cd399d7f995c3a10a6fbcf9741854bebb1a5ae7ea56028687 WHIRLPOOL 6f2ba8b1353ffe8bdae78ff9a82d13603db7aeec91916c638739f5afc396d5b73a0dd9af653f537417cfa4ae8b22dc78ecf0ca629452165d737e74cd56205d2a
+DIST libfm-1.1.2.2.tar.gz 1055591 SHA256 158e2b6974350d2dab15932b496bb4d448553e60bbf7cdfe4d6e9bd99d19d682 SHA512 0c50210432a70f18033df2ce2fc20ce84f987e5efc8a4e7341aa6b7076f132407765257eeaacbc5cd7f81a11465049a2f8c460444bf54f2707b6bd04d3a34239 WHIRLPOOL a24aeff516499188a194f310d8cec5a3211c48c7665301d14d54a55291f10a036ea0ab2a2e3f1e0ed776874f7787a93fbb22846ef50413820fbd9d3f66847b04
 DIST libfm-1.1.2.tar.gz 1055954 SHA256 d2d52fb9c4cd98632da60861e42af066e7225d592b7a59a6e3c3cd80ad9c8851 SHA512 aa8f720b3ff1f841247a055cf515fc4373a0b427ccc1a0e8313bf6e6d4f211cc8c8e3d08abc68d35db9431ea962c6515ddb70a8d50840869ee0228b5c1e302b8 WHIRLPOOL d65276b83b9a73184d9564b1cc5fe3b58a55798e8728aa25b4c4a077a7241cdd537d04f5ac55e329a2098abf827e4c70d8fc655ff935f71af576b53b984ae11b
 EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb98131e3112781e5f0de2106ca5588 SHA512 60400b6633ce414d29b6797904d1a3eacfb3d372e89cc765a822e92a2ba6f26294401d6989d0dd3a939b01572fcf5f89eedd6416ea15cfb2e8eed7cf45b99f90 WHIRLPOOL 05c0eb3b9813ccd33fa352e5904928e6f8fbd48a325832765a294a394de951bfa5fb2113cf3be7d786c743cddf8ad75b291bc9a5915d5a0de6083f7499f7b519
 EBUILD libfm-1.1.0-r1.ebuild 2915 SHA256 8fbea4769a2cf20ae3207855bd5215f1d4fce72051a41e4696e7fa0ceb34191b SHA512 f6e5b43984d508c9fd8c7b21897752d16ff130f9d0aaeae0636e2687fcbf7f076569a454fde309f5740f7d08862e58714e0fd1d3117a4ea7196b43735a101c5b WHIRLPOOL 805c07189f962f5f7763c50fefdc69e9019505da034ef2dac4f34e915e957912acc9081b3e9feb015a7bcba3f163822f8221dd2e51fd1a6e778d1d36fdde2782
+EBUILD libfm-1.1.2.2.ebuild 2914 SHA256 198924f5a92b5177bbd627ab5f925e08081bb32d98f6f45dd0fd9036dbe17908 SHA512 6f3b160e23d4cc13d5aa3b3931a33eac94a74c0392e1296a22a8c2725156ecaa8007956f5defbebc175bac9640e7168a22f9cfd109e823927b1db7da9ae08f6d WHIRLPOOL f38569c7561ff19938b2a1b7cead1af39bd372ae5e9c5fb5aa2d05d70b941baaa8ce7e7db8d4e38fc89081effbb18b4658d84d7d3c2cbb1538f9b9f7d79aa278
 EBUILD libfm-1.1.2.ebuild 2912 SHA256 2d368a45f1fc2e12e77eeeb601f3932c84ef9288165b3bb1223ffbbfe1f44c63 SHA512 42074e2fb53a68986dd26f45471a06d5950540638f4af657b01b84079a9618e2a8ad74f00487f82c749a4f562a4df2e6f8bfce6bec27c3c679dc2ac474dc10db WHIRLPOOL 256ba185df5b7706a6a35973f831f79a092065211606542aa255b07344e14e8c5eaaa41b6a15eda643b450f1a6d320bbc0566c89434c56dfa6c06e01837779ab
 EBUILD libfm-9999.ebuild 3080 SHA256 0db70c8b1216d7ebea17fd64535ecca72269c043e8e3b521049ff5f311e575ef SHA512 46307258b0a6e82195aaba48767d04358a1efba9f2b82b874179e12919cafa7dbdaa9f183d924cece965f109494b2b646d409c985ae48dcdd0ba258cc2e25cd7 WHIRLPOOL 091ce87368c2f7895945ea04f0c5ce4e7a8a785ade8e428df742087fc3629c64a11d73bf3f12d8a3f6d6be771b196e4f2a8b31ff2618f220a6cc03abaa4c109e
-MISC ChangeLog 12606 SHA256 8a244c2ff28baa61bf6237610b1871a571e874c5c28e3d63aff4b504f0d7df31 SHA512 b44f9323043a920f0c9a6ea0040f839026621557d8d82298beb0de7478e9a67348004a40e97a6e9cac8a58bcb5bf1f91ac7863adb6d3051b13edb72b9501742f WHIRLPOOL 88e8e86d363fb2a036508e9c1a484abd245ca4aaff0aa0883b94cb7d7db2fdbd14cd9dd6998f86cf91cc165a3e5206d3a1d834ce302f93923ec00aeb2e4a06be
+MISC ChangeLog 12728 SHA256 d40598945da17c517b74db4e3080da0dfe09ced53efbae04b516c0ffb7b9b325 SHA512 a359a76be82efb1d919b19553634f76d261d7f0e847f33cfacf82d3527747be75e58400b8148d0a209019e2e535a30f1e339c99dfeceeb42c53bd53dcdcdf182 WHIRLPOOL 30c41f59a368a651afb2059b04e04511cdba064202372483f9ff5d0a095cead2dd81c0c0c754b111f01a770d0d139504951f59ccfba41b861f3a430b554eb286
 MISC metadata.xml 333 SHA256 2b8b8fa5d91b0d1621729114380656e8c4236289beeacccd7c2523a824277610 SHA512 6baa6bcb510be3ec56280e4a8a803e1a06212a1f1896f8466f8948e17ccadb0993c5fae14242c9706e3e1d6d849bbc8cc52be3639bbb2a8eef0d8dab4a312219 WHIRLPOOL 89355edf375d07566cbec581ab43e6287c7a1501720a5e576f797abfde06e20dd5ae0d6d485da54058ba9c6e671f312b60de21a45283aaf573e617c1cbcfec6d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSD2SrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSUupgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887HMQAKvOBYIljA0dSqIJJnUWIqYY
-Dm2osbtYjJwJkNPammwAX87pGJV/vqT9c7QbEb65Ix0fTleA6ZqYDBEAQT/0EztW
-YpE95ik/POsIMpetHos9V/RNHxNthQx3R0ZUI6ui/XlLzQsHjho3pcbJK/PDGsUJ
-tV65AAfc8U8me0xR3ar5P1RCQSFVWcKQRNWIqQel4FL+K/k0adtkI/FF1c0l9tLn
-ytunORhq8Q9G+MFyfrM8o4UKXgD2zoGvzzhZkAaGqjDJrvxNXWCLfZB7+iUbQBfk
-4ISKb4s7aHiA5dch3UugyaBbwoTIcRTKx7HXl+zw0uLmeMphSnJuVd5RN0YwVxAn
-U/6xUJLgWIoaVX86y5q1tTdbjiToWFn7w/pGLvJrde2RGGFUZYeJrqttKuNVZIGP
-kF8e2yr5GcZvPSE+9T4SOaOnCAuWN422s1nhPE2j2PNXGEs8m1GV/E09mFL0m7+R
-mal26DByEjcjYmPpmLUBTVax8XGvj7hv3BgoP0bJF5P4l9n5y+/tQWYlwLNxdZ2+
-0GBgIsdlYIs5reaxuKwr+Z+g46YccfYf2Op1ZybNgTqDFhv/c91RQT6BJMx7Z2MQ
-5pJOKWtiW1OnKYUm0s8p4zKQ16ZSR1w8I27a4TCEtt0RCh5AZjp43RTn4o0CYcul
-9+yz/lxeb1tqQyMW3UA0
-=LTVs
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88WWgP/31wRP/JRIa6jNDUJFJ13ITY
+yLoX1iA1t3k4sEmwwrNV1/RWamtwJ9BZIAeCIXOoEf4MLD/Q24oMzmW4a24CqVfh
+Vd7EXfa2ocEr7rkCeLAgU4uwnkDyfGOtNhoqJh3bBIZRRmqiKGi8CS9FhX3c8obh
+RTpVSYlverG8SHfO466HFbDlz+0TlGI7NPT4UWwOZeKp6Mroq2+0kuzLMjXy3RoZ
+hy7vZrVsBwp1VBR40rSZMXrJGlUe+Pj3zcQneUX8efKnMoYQ4CtLaa+wkCtEoHNA
+vnwILgXS9lJGIoYKZs0OK98I7leffr4s3VRnBv1Mcs/EB+MO+VhxVdz+XKY3SRXU
+mzcxHX5AHhHnqX25cQqO/zyVrjbcmxVn/bjiHmtxe1pjEOjJ2PvMxGi4MCRaoCLN
+sf/7Au7CrD78gAR1kmAmfh4zVM5gDi1VzKrUBSncb0sIAtqARG4mmYB/g49n6xZf
+dBh2tXE6xKk8VIYNzXLrv6AfMPS6l7vGUl3he0lBRf+l0aLtkxf4kh+NvvEAQtji
+KytTQumeDZac3qUpZSrvK92lcTESCNXKT2nxt9Uf1nZ5uRGYHQIerF01MOnybwmZ
+pcrDbg1FrTy8e3b64jOz6qpvTg19Mkw/zKCmceZEYSom/fPPusfb6RGMFAyTHdVW
+JrJomZ00wsuhGfbAUf6Q
+=EcAA
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm/libfm-1.1.2.2.ebuild b/x11-libs/libfm/libfm-1.1.2.2.ebuild
new file mode 100644
index 000000000000..421e4619b8b3
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.1.2.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.2.2.ebuild,v 1.1 2013/10/07 17:09:06 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.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.5.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="debug doc examples vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	>=lxde-base/menu-cache-0.3.2"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	|| ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] )"
+DEPEND="${COMMON_DEPEND}
+	vala? ( $(vala_depend) )
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	if ! use doc; then
+		sed -ie '/SUBDIRS=/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"
+	#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
+	use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		--disable-udisks \
+		$(use_enable examples demo) \
+		$(use_enable debug) \
+		$(use_enable vala actions) \
+		$(use_enable doc gtk-doc)
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+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
+}
+
+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
+}