rebump to EAPI5 to use subslot deps

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

4 files changed, 143 insertions, 21 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index a5d6df26397c..196006ef1536 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libfm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.84 2012/12/23 14:40:40 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.85 2013/04/28 18:12:32 hwoarang Exp $
+
+*libfm-1.1.0-r1 (28 Apr 2013)
+
+  28 Apr 2013; Markos Chandras <hwoarang@gentoo.org> +libfm-1.1.0-r1.ebuild,
+  libfm-9999.ebuild:
+  rebump to EAPI5 to use subslot deps
 
   23 Dec 2012; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild:
   Rework broken symlink logic once again
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 76292b45342f..dfe57d5d2ca6 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -11,24 +11,27 @@ EBUILD libfm-0.1.17-r1.ebuild 1744 SHA256 f95b9a221f951124a89b7e067b2534bc8cb981
 EBUILD libfm-1.0.1.ebuild 1791 SHA256 3644fba0bf0c9b22e5a114edcd51778af3fb111f87f9e6ffe50c480574dd3eda SHA512 c8d3cf50bbdbde04343f07a9d66470a46ad91f8af957ea53a913ccd8934e5ce47ee1bd52de3b1facfdfaf2fc460cfa0b27f5449b96c2631ee613d53a99427f13 WHIRLPOOL 499dc5120527f725355dc598d3615c935179130129c16187ba9abff3bc72ac63c3ed05c584dcfcf893655a8b3c1cdb5692c2461a9a3e0a09e00dff37ddc9e32f
 EBUILD libfm-1.0.2.ebuild 2406 SHA256 90253c83dab9b33bf55b80409bad85796f6d7c571b649c232d972880508c237f SHA512 d7873e6dae63151d2177d59c4eded4a7026c0beaed656f23a2eb3aefe248dbeb364750219f767511cec12885aae9c0bc76ae7326e90fc41372056b446c4d54fb WHIRLPOOL 2e25f3b98be5cb38a7ea8b69ac655139dec113fd1c1ca290f90f21d3f99bcacdf53b896d08b30417eec5352905c3cee5e59b7602645099548d98a59c7d9d061e
 EBUILD libfm-1.0.ebuild 1736 SHA256 be6d18702f3e3261ceec910dca9bdaaf5811f46c23521ae99b7f23c262d1384c SHA512 b0559d23545e28049fe3e163668885d309b02b8bfbe239405f775f9876040addd443098967853e86cdae7a6f190bfda73603fb1ac9d9dbd597d2c67a65309ccc WHIRLPOOL 6886c173fcaf3ca70024cedfed7b5b32a636cd51288a3c9cec5416f6b079cbecf3a5ed829487d4bc9684d1448d664151440c6a77effb467aefe8db337eb32ec9
+EBUILD libfm-1.1.0-r1.ebuild 2915 SHA256 8fbea4769a2cf20ae3207855bd5215f1d4fce72051a41e4696e7fa0ceb34191b SHA512 f6e5b43984d508c9fd8c7b21897752d16ff130f9d0aaeae0636e2687fcbf7f076569a454fde309f5740f7d08862e58714e0fd1d3117a4ea7196b43735a101c5b WHIRLPOOL 805c07189f962f5f7763c50fefdc69e9019505da034ef2dac4f34e915e957912acc9081b3e9feb015a7bcba3f163822f8221dd2e51fd1a6e778d1d36fdde2782
 EBUILD libfm-1.1.0.ebuild 2406 SHA256 c794e90df5cc124de6d87c9d21e8f6990dddeabe41ee370e3d481d9d2dbf94cb SHA512 f7a3b7195fadbb4cd44f45e2933fafc5d39ee3abda5eaf9b1600fa7640731de650687ec235c4003fdc5d7a99b691bbfe677fd2e9151d829299fb399b6e72d53c WHIRLPOOL 54596cbb84e434c751f76c360c4bd26b15c7b5d921bcf999aa3dbfe4c42c03f72deaf73af1338699a26016adf4082809a3523ee7e6f2711cb42662b2a74b0b8a
-EBUILD libfm-9999.ebuild 2574 SHA256 e3af19c28fbcf77d4cc15580425e08beda09a8cf1b8f391c19fe2e5fce24205d SHA512 be8478418040c73653fd4b0377389e445062066b3e6532725b9f9f222bf53de2f8dd2a74b8286a65f790912a16cbffd2a40a6dd34ab351086995cf96a2f8c560 WHIRLPOOL ecbbcf72944403ce4019abbf6db913c7c50e216afd49842540252c0916fee94b2b8ada0d11d8e4d3ba2b5a925f2a0531a35082730ae87bf8d435a1e34f1788f0
-MISC ChangeLog 12161 SHA256 bcbe1c443cd821816f632ec69b0def9f8c583a89e553dc5222f044e2ae112a10 SHA512 d1c6246931f766d97d938a0b28c3fe9d999e1308333e4423c272fc97245d0e9639c9f37eb5697242c017bcd9d757c824abf3dfa963c800147719ab8f51b1d0fa WHIRLPOOL 2749bf1239c5b93c3c9d70f26fc5569a3535d81f5292e1572e871d6fca8ff693ecae0d66bb200e630a4524dbda5afa69c1fdfd864cdc7ddb4107765a87cd03a0
+EBUILD libfm-9999.ebuild 3080 SHA256 0db70c8b1216d7ebea17fd64535ecca72269c043e8e3b521049ff5f311e575ef SHA512 46307258b0a6e82195aaba48767d04358a1efba9f2b82b874179e12919cafa7dbdaa9f183d924cece965f109494b2b646d409c985ae48dcdd0ba258cc2e25cd7 WHIRLPOOL 091ce87368c2f7895945ea04f0c5ce4e7a8a785ade8e428df742087fc3629c64a11d73bf3f12d8a3f6d6be771b196e4f2a8b31ff2618f220a6cc03abaa4c109e
+MISC ChangeLog 12329 SHA256 36fd4c9dc699aa2d611f625d2ae5bf9120d492e33700899a435cfce5d8e03d95 SHA512 86768749b0169f113158eb43058977cbb655905b497b3f967fe210ccdf7bf1630433810b6e0c5b2a938dbed6aa8d7901b0bc95d59d5c29131c0be0fa9c301109 WHIRLPOOL b34eb84ca3024cf0008cb8c8508e5ac5c1ea00125698b845c73c69399fa8c4717668f9fa7e1c8194efa6cec9bd9db3365a47827a2492acce949950e02f240937
 MISC metadata.xml 333 SHA256 2b8b8fa5d91b0d1621729114380656e8c4236289beeacccd7c2523a824277610 SHA512 6baa6bcb510be3ec56280e4a8a803e1a06212a1f1896f8466f8948e17ccadb0993c5fae14242c9706e3e1d6d849bbc8cc52be3639bbb2a8eef0d8dab4a312219 WHIRLPOOL 89355edf375d07566cbec581ab43e6287c7a1501720a5e576f797abfde06e20dd5ae0d6d485da54058ba9c6e671f312b60de21a45283aaf573e617c1cbcfec6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ1xfoAAoJEPqDWhW0r/LCVxwP/jgcW6Mz718vQW4MXXEdjerb
-x4/mPycD0gZdeQh2qTtzA4XWYyU01XeMTO2JlyRJV4d7sv/hrAUnRlB143wBq0+j
-eJPWMkVh1mVUTwdWF2GlTSmVD6UyIN3FQV+sAg3fMngRrEWaiCZ02nqAa0ChQ40p
-J7KRJ2THKot6m1QCopa13lpsCsAImCtV6Dr2cHyQbD1kruyX4pGwcRHktX5ogKe0
-eqGSIviRkOPMF3sDFJ6s3oK21k97lwdUnYJ2rhdZ9ym6hmVKCAW63Msqb2wGfntt
-wB4l+0WuLD7Me7LqZ7SAOqX29C4K5wlZsSqJBn6HlAPqfTp73X+g7oCAKd09dH6g
-Sy9N8zF8JJvAen0yg2DAViU0tCFg9JHkpXVprRh2Sby/QT1LQN4drMTtOD0c8+V7
-Qss0qnkGm5xeI1kqw7Vjp2MkLY1Z//AN3+IcnlCJBHw03GxNPF9MtT6Wv6x3plGa
-a9BG5o6cBpS+o9NXU+VUNHJOLz8rAEFPAa/r3gOdME2cHOrwHzKoTyqx5Zw8LfzS
-VGEsHtOmD/46vs6M1po5dRNX2brvg2LOHVpL7bCP+7yO2vPzoW35sHrEp+j5M6Qm
-Hqidv3pT/bugxqmNDrqWSuXvk730WdLIcAF5HvYOwNhIvoXm/ks4MxhO9IccPNFr
-vhQzEvTMMadFQBZ8UuRl
-=i+l8
+iQJ8BAEBCABmBQJRfWaQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88iUYQAIPO01irPjl4+iHxB5yJIZCm
+xKqzlk+B0T05TKPDSF73g0BjnvZ4rML/Upq7LxEJM2iWnVbhNvvcH5YcmbGQ6ry9
+YVDTiSxbgXqRRd6F39HfriMMw8nmpd+0XyrZZeJYXmQvCjCCk0V6cAiN72hTQpPb
+ThpQV/OxUKajs0pj4jS7TSs17YMzYFwXj8ce35L0Yp++W9ooMcvpEqu08MC3TOia
+OGbhEFjUozQ+2ZERuKUMx9IUit+dFdc2KH8ufKlKGDcjzXUvJSSzIlG2yPe9KpYu
+rbsu9GNKcxKyTPWZM/pvAimB/YF6PTekUsVYgB26tXlF3iU/1skN2DS0gYhkg1PF
+KS2Mkk2W66WsdOJYU6iiLYtYEv4wfo0F2BZROzK719+sPX0t1mrE2XsLIWBcqMEw
+ngHLemfZnXas6PuemBw6N1NxSIzFM1VWJXpRZibUXOhdAbFhFF7KwllGCmDJcgCr
+gNMkfi9QDtGqhxLX0CRnB1vcKu9e7OKWOJLDjkFU6JhmkrXMm28FiuUYenbiw6ZT
+72NybVTFVH9KJJIsrZBR05rga2Sd4JacIONUhjxZpEd5J1ahFlFFmN20taL5/C2X
+GO852t+lGnRpCQu64pSHXZhGwa4d0mPpJlNXLF1bDT09LQfSdM7YdXC3ZC2VixJU
+Gfsk3lTy042R/IzsDMhl
+=xCqh
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libfm/libfm-1.1.0-r1.ebuild b/x11-libs/libfm/libfm-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..6c7ed274e8df
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.1.0-r1.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.0-r1.ebuild,v 1.1 2013/04/28 18:12:32 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.1.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
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
index 2e768eb148b0..02cfffa9e18e 100644
--- a/x11-libs/libfm/libfm-9999.ebuild
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-9999.ebuild,v 1.32 2012/12/23 14:40:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.33 2013/04/28 18:12:32 hwoarang Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A library for file management"
 HOMEPAGE="http://pcmanfm.sourceforge.net/"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/4.0.0" #copy ABI_VERSION because it seems upstream change it randomly
 IUSE="debug doc examples vala"
 KEYWORDS=""
 
@@ -54,6 +54,18 @@ src_prepare() {
 	sed -i "/@LN_S@ @PACKAGE@-@FMLIBVER@/d" src/Makefile.am \
 		|| die "failed to remove the includedir symlink"
 
+	# 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))"
@@ -85,7 +97,7 @@ pkg_preinst() {
 	[[ -d "${ROOT}"/usr/include/${PN} ]] && \
 		rm -rf "${ROOT}"/usr/include/${PN}
 	if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
-		cd ${D}/usr/include
+		cd "${D}"/usr/include
 		ln -s --force ${PN}-1.0 ${PN}
 	fi
 }