diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-04 12:02:00 +0100 |
| commit | eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch) | |
| tree | ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /x11-misc/shared-mime-info | |
| parent | b7ebc951da8800f711142f69d9d958bde67a112d (diff) | |
gentoo resync : 04.05.2019
Diffstat (limited to 'x11-misc/shared-mime-info')
| -rw-r--r-- | x11-misc/shared-mime-info/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild (renamed from x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild) | 21 |
2 files changed, 17 insertions, 7 deletions
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index 8996e372571e..802b631c9134 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1,5 +1,4 @@ DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda -DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491 +EBUILD shared-mime-info-1.10-r1.ebuild 1774 BLAKE2B 6f839bc739e55b8888479d81d0460efee2b1bcd0038173877fe3de075c7ee612a1d4724ea1ea5fdccd564024d2d9b338b5a82d6c6ea90de1f88302d79bbbca10 SHA512 4c81df64a3050f24a95e8fa0e357f46c67612f38e15a41f2745a2b743850963e9b5382979b4fa6f022fdcd2893e8043b25de8710d9e802b7783763b3327a8fe3 EBUILD shared-mime-info-1.10.ebuild 1494 BLAKE2B f958e53f7f581f9b081a16f962e82a4f56c31056b9203bd1969be5f97e393505018c37efd3502f95b64a95ec03d434e107e934ba8ca8af6fa0793c79ce568e01 SHA512 9ac4861ae32f3bc9120b1a84d318f0ebdf5b026a4bb899a538833ac365a46958637f7698cd4d7db561a7a26cbb003e0c09208ae535a34f69258b12092a9c2880 -EBUILD shared-mime-info-1.9.ebuild 1457 BLAKE2B 582d75bcee9c267dc39f7120cd734085a963621e82fa4ba91288420f3390767c03672aca23f1b367aba252f8ae24396be44084f8a90cbb3da213f081de2aad3a SHA512 112646b17c088c2e0f34f8bce8255738ebc5881f404437d2eacb3dc101bf3362b2409a2923dd33ee9198da804d0a4f9b24c052b87499081621131e751f6c8070 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild index 2349bbffbd2a..1529b9bf6c71 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild +++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit xdg-utils +inherit flag-o-matic xdg-utils DESCRIPTION="The Shared MIME-info Database specification" HOMEPAGE="https://freedesktop.org/wiki/Software/shared-mime-info" @@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=">=dev-libs/glib-2 @@ -25,9 +25,20 @@ DOCS=( ChangeLog HACKING NEWS README ) src_configure() { export ac_cv_func_fdatasync=no #487504 - econf \ - $(use_enable test default-make-check) \ + if [[ ${PV} == 1.10 ]]; then + # https://bugs.gentoo.org/684884 + append-lfs-flags + else + eerror "LFS support merged upstream." + eerror "https://gitlab.freedesktop.org/xdg/shared-mime-info/merge_requests/20" + die "Please remove LFS workaround." + fi + + local myeconfargs=( + $(use_enable test default-make-check) --disable-update-mimedb + ) + econf "${myeconfargs[@]}" } src_compile() { |