diff options
author | 2014-01-18 14:17:01 -0800 | |
---|---|---|
committer | 2014-01-18 14:17:01 -0800 | |
commit | c103b3fdfb1c1225d37f9a296bbbe6352c6451fa (patch) | |
tree | 1a7077c68861d8cc784ebc1b20ab348234740085 /gnome-base | |
parent | eclass/virtualx: clean up file handle (diff) | |
download | gmt-c103b3fdfb1c1225d37f9a296bbbe6352c6451fa.tar.gz gmt-c103b3fdfb1c1225d37f9a296bbbe6352c6451fa.tar.bz2 gmt-c103b3fdfb1c1225d37f9a296bbbe6352c6451fa.zip |
gnome-base/gnome-vfs: multilib-utize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-vfs/Manifest | 2 | ||||
-rw-r--r-- | gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild | 67 |
2 files changed, 41 insertions, 28 deletions
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest index a100fe0..79aeeba 100644 --- a/gnome-base/gnome-vfs/Manifest +++ b/gnome-base/gnome-vfs/Manifest @@ -10,6 +10,6 @@ AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 SHA256 77dcd6c2dd00d05b AUX gnome-vfs-2.24.4-gnutls27.patch 3235 SHA256 36ddcc5004189c3aea4edbd88fa3bbfe605737b21246110b144ffffcfc29c38c SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25 WHIRLPOOL 4c8a3e8f2202c31ebca9df4281f8212d65ab7ca04466034fbedb25c999644c55464950b3253c436fe0f5c65f3476894205d16178875834885d44a96f6ccde9b0 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f WHIRLPOOL 253cf6b04c06bc03cd97ea10b7d6a5d82500b6c54aa835502e7ba6517abec5782e84997a34a2397b863ba2a37af07b697cb452c3486fd0d98a7cd67cd5fc7cfe DIST gnome-vfs-2.24.4.tar.bz2 1890370 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581 WHIRLPOOL 53376928ae04cc1d693e57afe18f2b91431b8c8d678cf58eedd057eb23e9f34010294faf83e3085126adf310da5a135076cf085f63f1db0d3a1add21cc0641a9 -EBUILD gnome-vfs-2.24.4-r2.ebuild 3688 SHA256 19ba23f51812b51971bb1f9f53cfe4558ce6790d209d062e49b5195fc2831367 SHA512 822b08f48932fbf4734b426d7adcafa89e31ac4c9fbc534a1c8db3e43f3d84d8bff24a57b8e7b36bf46066e74d4b39f2e6bb16460ffef25b0acdd2eac01f9588 WHIRLPOOL b4bc6441d3da34d704683d4d875a935005285c56602152080cfb7777593e0906f337a341248739c689ab27e0a352f5bc4e9ffc0f11a2cfdfcc71bdad80161b64 +EBUILD gnome-vfs-2.24.4-r2.ebuild 4484 SHA256 73fb78729e95f03542f47df799adeb22136650b776cbd651704f48ab1ed2cbaf SHA512 c1a69498984b3c49306eef98c22b192a12291d7d3d47d605351d1908b1073e6a8cdf3f66a87b3de965492c9bc1a26c0a4e3e5d2ea54b2ac329d3784a309a72ad WHIRLPOOL 622c37ac78c8bcbd0252f371aadc05eeb5cafb39631d0e4fe11d36e293e9fcdee716667cf7a340e17988aaf0d977c4c47e621c30d408629bafa5ae6dfd9fee14 MISC ChangeLog 46450 SHA256 e82ef9bdac3e6843b8ec10dd9ed4d60d3f13a152172641b7e4022a4b881de42d SHA512 3aa33e4e7eae094a933d2eb700a948d6462c4a517b8bf5b832c8b28e6345774335c82c9b4c3b378a244764d46d70a976302f4556d8eff97cc01c265d135e5d33 WHIRLPOOL f841c241b0365606ecba540a91b628038cd61d10baa230c01fb12c8b06c9846c1c9b922a2834a5bd03bcbba643dff80d51f54db7f58c1a8093097b4ce8e622df MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild index 31a1740..5669458 100644 --- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild +++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild @@ -2,43 +2,44 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI="5" GCONF_DEBUG="no" +GNOME_TARBALL_SUFFIX="bz2" -inherit autotools eutils gnome2 virtualx +inherit gtk-doc autotools eutils virtualx gnome2-multilib DESCRIPTION="Gnome Virtual Filesystem" HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2 LGPL-2" SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~amd64" IUSE="acl avahi doc fam gnutls ipv6 kerberos samba ssl" -RDEPEND=">=gnome-base/gconf-2 - >=dev-libs/glib-2.9.3 - >=dev-libs/libxml2-2.6 - app-arch/bzip2 +RDEPEND=">=gnome-base/gconf-2[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.9.3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.6[${MULTILIB_USEDEP}] + app-arch/bzip2[${MULTILIB_USEDEP}] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 - >=dev-libs/dbus-glib-0.71 + >=dev-libs/dbus-glib-0.71[${MULTILIB_USEDEP}] acl? ( - sys-apps/acl - sys-apps/attr ) - avahi? ( >=net-dns/avahi-0.6 ) - kerberos? ( virtual/krb5 ) - fam? ( virtual/fam ) - samba? ( >=net-fs/samba-3 ) + sys-apps/acl[${MULTILIB_USEDEP}] + sys-apps/attr[${MULTILIB_USEDEP}] ) + avahi? ( >=net-dns/avahi-0.6[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) + fam? ( virtual/fam[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3[${MULTILIB_USEDEP}] ) ssl? ( gnutls? ( - net-libs/gnutls + net-libs/gnutls[${MULTILIB_USEDEP}] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( - >=dev-libs/openssl-0.9.5 + >=dev-libs/openssl-0.9.5[${MULTILIB_USEDEP}] !gnome-extra/gnome-vfs-sftp ) ) " DEPEND="${RDEPEND} - sys-devel/gettext + sys-devel/gettext[${MULTILIB_USEDEP}] gnome-base/gnome-common >=dev-util/intltool-0.40 virtual/pkgconfig @@ -47,8 +48,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" +AUTOTOOLS_AUTORECONF=yes +AUTOTOOLS_TEST_MAKE=Xemake +MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test" + pkg_setup() { - G2CONF="${G2CONF} + G2CONF=( --disable-schemas-install --disable-static --disable-cdda @@ -61,13 +66,14 @@ pkg_setup() { $(use_enable ipv6) $(use_enable kerberos krb5) $(use_enable samba) - $(use_enable ssl openssl)" + $(use_enable ssl openssl) + ) # Useless ? --enable-http-neon # this works because of the order of configure parsing # so should always be behind the use_enable options # foser <foser@gentoo.org 19 Apr 2004 - use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl" + use gnutls && use ssl && G2CONF+=("--disable-openssl") } src_prepare() { @@ -118,19 +124,26 @@ src_prepare() { sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die - eautoreconf - - gnome2_src_prepare + gnome2-multilib_src_prepare } -src_test() { +ehook gnome2-multilib-global-pre_src_test my_global_pre_test +my_global_pre_test() { unset DISPLAY # Fix bug #285706 unset XAUTHORITY - Xemake check || die "tests failed" + return 0 +} + +ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test +my_abi_pre_test() { + # with any luck this wil enable an astute/lucky observer to discern the ABI generating + # a given test-result summary, in spite of std. parallel-test tty multiplex cluster-fuck + myemaketestargs+=(PACKAGE_STRING="Gnome-VFS (${MULTILIB_BUILD_ABI})") + return 0 } -src_install() { - gnome2_src_install +ehook gnome2-multilib-per-abi-post_src_install my_abi_post_install +my_abi_post_install() { find "${ED}/usr/$(get_libdir)/gnome-vfs-2.0/modules/" -name "*.la" -delete || die } |