diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:19:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-14 23:22:23 +0100 |
| commit | 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch) | |
| tree | 76e74807bc479502e13866b581b6bf86734ec634 /gnome-base/nautilus | |
| parent | 30d6f67c98d149508509d5e86f176d558793acc0 (diff) | |
gentoo resync : 13.10.2019
Diffstat (limited to 'gnome-base/nautilus')
| -rw-r--r-- | gnome-base/nautilus/Manifest | 8 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-3.30.5-r1.ebuild | 2 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-3.32.3.ebuild | 6 |
3 files changed, 4 insertions, 12 deletions
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 5b04f78920b2..a7b46f0d349a 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -6,10 +6,6 @@ AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601b AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392 -EBUILD nautilus-3.30.5-r1.ebuild 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5 -<<<<<<< HEAD -EBUILD nautilus-3.32.3.ebuild 2965 BLAKE2B f0ae2d8d8df70b9e5c7d70027c6b1340ea518f77c3d8625ed9240255a11bd3ccb9ef2e83fbe006b83f2e71d1d26714d8d5dc79314594c1e2a7e33bdd07b3005d SHA512 23ee9d7623c6121e4ec67b8a9db0da41ccb7fca90fd62f76a3012115499c2585c99334d1631f9dce1d150abd1585da203c7d8cc398601fbf48423070e3bcffe3 -======= -EBUILD nautilus-3.32.3.ebuild 3078 BLAKE2B 91ff9260991be11484aa65e12f945708658d13cbbe26a557a5c5b8e7025d826f5b98eff980171865cd71d33d392f216dc03ae76bfd52554216ab7fb12c8dd3c9 SHA512 b6b8634003ad671d6cff134d20d4fd6a4d1b8f2ee840c6413ce9bbf1cc5969aa6fe13377e70fe474733c15a0e4461c55169f83f24543c7643efefcb641d39adf ->>>>>>> next +EBUILD nautilus-3.30.5-r1.ebuild 2812 BLAKE2B 3f0057267cfea02f9c6d8db52363a24efc52836f932130c23ec64363899ece863590655aa87ffe323667033987c7999a1eac5cef897696688245e078f755c9f1 SHA512 481cde050147e497327d95d0cf1793653cf79b25b4ed74a9452e62e368330aa42f62e3056e16db54fba8bf681befef1dc1b7c61a38b6e43db3c914761c126361 +EBUILD nautilus-3.32.3.ebuild 3068 BLAKE2B 374cda29507c72db2a4685f616f1182e4313cfed13e20dbd7f50de6777d1c6bc7d186b7e4f1cdb55cd772f89747aa21bf6ce89072441ab226505773b0dd4dca6 SHA512 382a40f8b3a208b4b02887ad2ce3e113482c9e45b84bf7d415a546008398862ccde7891826f4278fb0eee89e40ab12d9b75cab7efef21e3eddc7303e36a4c4f8 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981 diff --git a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild index eeea495a5de9..cdb86ae33285 100644 --- a/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild +++ b/gnome-base/nautilus/nautilus-3.30.5-r1.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="gnome gtk-doc +introspection packagekit +previewer seccomp selinux sendto" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" >=dev-libs/glib-2.55.1:2 diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild index 3197ede8970f..0b50759cd36c 100644 --- a/gnome-base/nautilus/nautilus-3.32.3.ebuild +++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+" SLOT="0" IUSE="gnome +gstreamer gtk-doc +introspection packagekit +previewer seccomp selinux sendto" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" >=dev-libs/glib-2.58.1:2 @@ -35,12 +35,8 @@ RDEPEND="${COMMON_DEPEND} seccomp? ( >=sys-apps/bubblewrap-0.3.1 ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 ) gstreamer? ( !<media-video/totem-3.31.91[nautilus] ) -<<<<<<< HEAD -" -======= >=app-misc/tracker-miners-2.0:= " # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners ->>>>>>> next DEPEND="${COMMON_DEPEND} media-libs/fontconfig " |