+Date: Sun, 15 May 2016 15:15:50 -0400
+Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766487
+---
+ configure.ac | 8 ++++++++
+ src/sqlite/Makefile.am | 9 +++++++--
+ 2 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2ccda7a..b6c978a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then
+ AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal])
+ fi
+
++####################################################################
++# Check for SQLite
++####################################################################
++
++# Our copy of sqlite requires libdl on some platforms
++AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=])
++AC_SUBST(LIBDL)
++
+ ##################################################################
+ # Check for libtracker-common, make sure libstemmer exists
+ ##################################################################
+diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am
+index 8b0ac18..354f054 100644
+--- a/src/sqlite/Makefile.am
++++ b/src/sqlite/Makefile.am
+@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src \
+ -DSQLITE_THREADSAFE=1 \
+ -DSQLITE_ENABLE_FTS4 \
+- -DSQLITE_ENABLE_FTS3_TOKENIZER
++ -DSQLITE_ENABLE_FTS3_TOKENIZER \
++ -pthread
+
+ noinst_LTLIBRARIES = libtracker-sqlite.la
+
+@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES = \
+ sqlite3.h \
+ sqlite3ext.h
+
++libtracker_sqlite_la_LDFLAGS = \
++ -pthread
++
+ libtracker_sqlite_la_LIBADD = \
+- $(BUILD_LIBS)
++ $(BUILD_LIBS) \
++ $(LIBDL)
+--
+2.8.2
+
diff --git a/app-misc/tracker/tracker-1.6.2.ebuild b/app-misc/tracker/tracker-1.6.2.ebuild
index c51a021db2e1..f4b891ad8988 100644
--- a/app-misc/tracker/tracker-1.6.2.ebuild
+++ b/app-misc/tracker/tracker-1.6.2.ebuild
@@ -141,6 +141,9 @@ src_prepare() {
# Ensure embedded sqlite.h is in the include path (from 1.6 branch)
epatch "${FILESDIR}"/${P}-include-path.patch
+ # embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487
+ epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch
+
eautoreconf # See bug #367975
gnome2_src_prepare
vala_src_prepare
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
index a60d73f4b06f..e164b14eb3b4 100644
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ b/app-office/scribus/scribus-1.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
diff --git a/app-portage/eix/eix-0.31.7-r1.ebuild b/app-portage/eix/eix-0.31.7-r1.ebuild
index 1a2a236e9aab..a50a8f07629a 100644
--- a/app-portage/eix/eix-0.31.7-r1.ebuild
+++ b/app-portage/eix/eix-0.31.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"
BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
diff --git a/app-portage/euscan/euscan-0.1.1-r1.ebuild b/app-portage/euscan/euscan-0.1.1-r1.ebuild
index 73a04ab40614..ad9be0c4bb0b 100644
--- a/app-portage/euscan/euscan-0.1.1-r1.ebuild
+++ b/app-portage/euscan/euscan-0.1.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild
index 2ede23673d7d..ee4e5db1cdcf 100644
--- a/app-shells/ksh/ksh-93.20140625.ebuild
+++ b/app-shells/ksh/ksh-93.20140625.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz
LICENSE="CPL-1.0 EPL-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="!app-shells/pdksh"
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index 9ee438db230f..124e93e4dfe4 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="doc test"
RDEPEND="
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 795a983ca7d6..e6bf84f0e2ac 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,4 +1,3 @@
-DIST pandoc-1.12.1.tar.gz 991330 SHA256 ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512 79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979 WHIRLPOOL b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0
DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
DIST pandoc-1.14.0.4.tar.gz 2052114 SHA256 01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443 WHIRLPOOL bc95f9b480b2336c7e0470187609a12d5e1f3ef5074af0bebb72c622d7c056efa74fa682190c08d9721f16b919d9264b859b2cbede2ac192870c419a60b5ef8c
diff --git a/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch b/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
deleted file mode 100644
index 0ba930f4cfed..000000000000
--- a/app-text/pandoc/files/pandoc-1.11.1-highlighting-kate-0.5.5-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- pandoc-1.11.1-orig/tests/lhs-test.html+lhs 2013-03-18 09:26:59.000000000 +1100
-+++ pandoc-1.11.1/tests/lhs-test.html+lhs 2013-09-14 10:27:51.318546683 +1000
-@@ -30,7 +30,7 @@
- lhs test
- unsplit
is an arrow that takes a pair of values and combines them to return a single value:
- > unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
--> unsplit = arr . uncurry
-+> unsplit = arr . uncurry
- > -- arr (\op (x,y) -> x `op` y)
- (***)
combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).
- f *** g = first f >>> second g
---- pandoc-1.11.1-orig/tests/lhs-test.html 2013-03-18 09:26:59.000000000 +1100
-+++ pandoc-1.11.1/tests/lhs-test.html 2013-09-14 10:27:28.671546899 +1000
-@@ -30,7 +30,7 @@
- lhs test
- unsplit
is an arrow that takes a pair of values and combines them to return a single value:
- unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d
--unsplit = arr . uncurry
-+unsplit = arr . uncurry
- -- arr (\op (x,y) -> x `op` y)
- (***)
combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).
- f *** g = first f >>> second g
---- pandoc-1.11.1-orig/tests/lhs-test.latex 2013-09-14 10:46:07.412536229 +1000
-+++ pandoc-1.11.1/tests/lhs-test.latex 2013-09-14 10:45:51.638536380 +1000
-@@ -21,7 +21,7 @@
- \usepackage{color}
- \usepackage{fancyvrb}
- \newcommand{\VerbBar}{|}
--\DefineShortVerb[commandchars=\\\{\}]{\|}
-+\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
- \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
- % Add ',fontsize=\small' for more characters per line
- \newenvironment{Shaded}{}{}
-@@ -73,7 +73,7 @@
- \begin{Shaded}
- \begin{Highlighting}[]
- \OtherTok{unsplit ::} \NormalTok{(}\DataTypeTok{Arrow} \NormalTok{a) }\OtherTok{=>} \NormalTok{(b }\OtherTok{->} \NormalTok{c }\OtherTok{->} \NormalTok{d) }\OtherTok{->} \NormalTok{a (b, c) d}
--\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \FunctionTok{uncurry}
-+\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \NormalTok{uncurry}
- \CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
- \end{Highlighting}
- \end{Shaded}
diff --git a/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch b/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
deleted file mode 100644
index 93528d31204e..000000000000
--- a/app-text/pandoc/files/pandoc-1.11.1-no-man-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fails on ghc-7.6 only as:
-
- tables.man
- ../dist/build/pandoc/pandoc --data-dir .. tables.native -r native -w man --columns=78
-- 141 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 141 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-- 177 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 177 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-- 247 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
-+ 247 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
-
-diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
-index 9e74935..d4cf2a9 100644
---- a/tests/Tests/Old.hs
-+++ b/tests/Tests/Old.hs
-@@ -126,7 +126,7 @@ tests = [ testGroup "markdown"
- ]
- , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
- [ "opendocument" , "context" , "texinfo"
-- , "man" , "plain" , "rtf", "org", "asciidoc"
-+ {- , "man" -} , "plain" , "rtf", "org", "asciidoc"
- ]
- ]
-
diff --git a/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch b/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
deleted file mode 100644
index ed3c3e89a0be..000000000000
--- a/app-text/pandoc/files/pandoc-1.11.1-tagsoup-0.13.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- pandoc-1.11.1-orig/pandoc.cabal 2013-03-18 09:26:59.000000000 +1100
-+++ pandoc-1.11.1/pandoc.cabal 2013-08-10 12:52:49.969834000 +1000
-@@ -232,7 +232,7 @@
- citeproc-hs >= 0.3.7 && < 0.4,
- pandoc-types >= 1.10 && < 1.11,
- json >= 0.4 && < 0.8,
-- tagsoup >= 0.12.5 && < 0.13,
-+ tagsoup >= 0.12.5 && < 0.14,
- base64-bytestring >= 0.1 && < 1.1,
- zlib >= 0.5 && < 0.6,
- highlighting-kate >= 0.5.3.7 && < 0.6,
---- /dev/null 2013-08-09 12:59:27.506999856 +1000
-+++ pandoc-1.11.1/src/Text/Pandoc/Compat/TagSoupEntity.hs 2013-08-10 12:28:14.261739000 +1000
-@@ -0,0 +1,15 @@
-+{-# LANGUAGE CPP #-}
-+module Text.Pandoc.Compat.TagSoupEntity (lookupEntity
-+ ) where
-+
-+import qualified Text.HTML.TagSoup.Entity as TE
-+
-+lookupEntity :: String -> Maybe Char
-+#if MIN_VERSION_tagsoup(0,13,0)
-+lookupEntity = str2chr . TE.lookupEntity
-+ where str2chr :: Maybe String -> Maybe Char
-+ str2chr (Just [c]) = Just c
-+ str2chr _ = Nothing
-+#else
-+lookupEntity = TE.lookupEntity
-+#endif
---- pandoc-1.11.1-orig/src/Text/Pandoc/Parsing.hs 2013-03-18 09:26:57.000000000 +1100
-+++ pandoc-1.11.1/src/Text/Pandoc/Parsing.hs 2013-08-10 12:28:14.262814000 +1000
-@@ -159,7 +159,7 @@
- import Text.Pandoc.Shared
- import qualified Data.Map as M
- import Text.TeXMath.Macros (applyMacros, Macro, parseMacroDefinitions)
--import Text.HTML.TagSoup.Entity ( lookupEntity )
-+import Text.Pandoc.Compat.TagSoupEntity ( lookupEntity )
- import Data.Default
- import qualified Data.Set as Set
- import Control.Monad.Reader
---- pandoc-1.11.1-orig/src/Text/Pandoc/Readers/DocBook.hs 2013-03-18 09:26:57.000000000 +1100
-+++ pandoc-1.11.1/src/Text/Pandoc/Readers/DocBook.hs 2013-08-10 12:28:14.264936000 +1000
-@@ -4,7 +4,7 @@
- import Text.Pandoc.Definition
- import Text.Pandoc.Builder
- import Text.XML.Light
--import Text.HTML.TagSoup.Entity (lookupEntity)
-+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
- import Data.Generics
- import Data.Monoid
- import Data.Char (isSpace)
---- pandoc-1.11.1-orig/src/Text/Pandoc/XML.hs 2013-03-18 09:26:57.000000000 +1100
-+++ pandoc-1.11.1/src/Text/Pandoc/XML.hs 2013-08-10 12:28:17.333957000 +1000
-@@ -39,7 +39,7 @@
-
- import Text.Pandoc.Pretty
- import Data.Char (ord, isAscii, isSpace)
--import Text.HTML.TagSoup.Entity (lookupEntity)
-+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
-
- -- | Remove everything between <...>
- stripTags :: String -> String
diff --git a/app-text/pandoc/files/pandoc-1.11.1-test.patch b/app-text/pandoc/files/pandoc-1.11.1-test.patch
deleted file mode 100644
index d5d1e894d505..000000000000
--- a/app-text/pandoc/files/pandoc-1.11.1-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit fa978e13658f76be109243224f7491550db74240
-Author: John MacFarlane
-Date: Tue May 7 20:22:09 2013 -0700
-
- Use latest highlighting-kate and texmath.
-
- Closes #849.
-
-diff --git a/pandoc.cabal b/pandoc.cabal
-index 5f290a9..ea9e850 100644
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -241,7 +241,7 @@ Library
- old-locale >= 1 && < 1.1,
- time >= 1.2 && < 1.5,
- HTTP >= 4000.0.5 && < 4000.3,
-- texmath >= 0.6.1.3 && < 0.7,
-+ texmath >= 0.6.1.5 && < 0.7,
- xml >= 1.3.12 && < 1.4,
- random >= 1 && < 1.1,
- extensible-exceptions >= 0.1 && < 0.2,
-@@ -251,7 +251,7 @@ Library
- tagsoup >= 0.12.5 && < 0.13,
- base64-bytestring >= 0.1 && < 1.1,
- zlib >= 0.5 && < 0.6,
-- highlighting-kate >= 0.5.3.7 && < 0.6,
-+ highlighting-kate >= 0.5.3.9 && < 0.6,
- data-default >= 0.4 && < 0.6,
- temporary >= 1.1 && < 1.2,
- blaze-html >= 0.5 && < 0.7,
-diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
-index 16e9a79..2a5025a 100644
---- a/tests/lhs-test.latex
-+++ b/tests/lhs-test.latex
-@@ -22,6 +22,7 @@
- \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
- \usepackage{color}
- \usepackage{fancyvrb}
-+\newcommand{\VerbBar}{|}
- \DefineShortVerb[commandchars=\\\{\}]{\|}
- \DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
- % Add ',fontsize=\small' for more characters per line
diff --git a/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch b/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
deleted file mode 100644
index 3ed96c2a1b94..000000000000
--- a/app-text/pandoc/files/pandoc-1.13.2-ghc-7.10.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- pandoc-1.13.2-orig/pandoc.cabal 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/pandoc.cabal 2015-01-05 10:39:17.951823846 +1100
-@@ -250,7 +250,7 @@
- hslua >= 0.3 && < 0.4,
- binary >= 0.5 && < 0.8,
- SHA >= 1.6 && < 1.7,
-- haddock-library >= 1.1 && < 1.2,
-+ haddock-library >= 1.1 && < 1.3,
- old-time,
- deepseq-generics >= 0.1 && < 0.2,
- JuicyPixels >= 3.1.6.1 && < 3.3
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Haddock.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Haddock.hs 2015-01-05 14:24:34.371820789 +1100
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {- |
- Module : Text.Pandoc.Readers.Haddock
- Copyright : Copyright (C) 2013 David Lazar
-@@ -29,7 +30,12 @@
- readHaddock :: ReaderOptions -- ^ Reader options
- -> String -- ^ String to parse
- -> Pandoc
--readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
-+readHaddock opts =
-+#if MIN_VERSION_haddock_library(1,2,0)
-+ B.doc . docHToBlocks . trace' . _doc . parseParas
-+#else
-+ B.doc . docHToBlocks . trace' . parseParas
-+#endif
- where trace' x = if readerTrace opts
- then trace (show x) x
- else x
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/LaTeX.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/LaTeX.hs 2015-01-05 11:20:35.193045904 +1100
-@@ -592,7 +592,7 @@
-
- unescapeURL :: String -> String
- unescapeURL ('\\':x:xs) | isEscapable x = x:unescapeURL xs
-- where isEscapable c = c `elem` "#$%&~_^\\{}"
-+ where isEscapable c = c `elem` ("#$%&~_^\\{}" :: String)
- unescapeURL (x:xs) = x:unescapeURL xs
- unescapeURL [] = ""
-
-@@ -1224,7 +1224,7 @@
- <* optional sp
- <* optional (char ',')
- <* optional sp)
-- where isBibtexKeyChar c = isAlphaNum c || c `elem` ".:;?!`'()/*@_+=-[]*"
-+ where isBibtexKeyChar c = isAlphaNum c || c `elem` (".:;?!`'()/*@_+=-[]*" :: String)
-
- cites :: CitationMode -> Bool -> LP [Citation]
- cites mode multi = try $ do
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Org.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Org.hs 2015-01-05 11:24:53.294689830 +1100
-@@ -1,5 +1,6 @@
- {-# LANGUAGE OverloadedStrings #-}
- {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-+{-# LANGUAGE FlexibleContexts #-}
- {-
- Copyright (C) 2014 Albert Krewinkel
-
-@@ -1168,7 +1169,7 @@
-
- isUri :: String -> Bool
- isUri s = let (scheme, path) = break (== ':') s
-- in all (\c -> isAlphaNum c || c `elem` ".-") scheme
-+ in all (\c -> isAlphaNum c || c `elem` (".-" :: String)) scheme
- && not (null path)
-
- isAbsoluteFilePath :: String -> Bool
-@@ -1214,7 +1215,7 @@
- solidify = map replaceSpecialChar
- where replaceSpecialChar c
- | isAlphaNum c = c
-- | c `elem` "_.-:" = c
-+ | c `elem` ("_.-:" :: String) = c
- | otherwise = '-'
-
- -- | Parses an inline code block and marks it as an babel block.
-@@ -1465,7 +1466,7 @@
- parseAsMathMLSym :: String -> Maybe Inlines
- parseAsMathMLSym cs = B.str <$> MathMLEntityMap.getUnicode (clean cs)
- -- dropWhileEnd would be nice here, but it's not available before base 4.5
-- where clean = reverse . dropWhile (`elem` "{}") . reverse . drop 1
-+ where clean = reverse . dropWhile (`elem` ("{}" :: String)) . reverse . drop 1
-
- state :: ParserState
- state = def{ stateOptions = def{ readerParseRaw = True }}
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/RST.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/RST.hs 2015-01-05 11:21:59.819266953 +1100
-@@ -1,4 +1,5 @@
- {-# LANGUAGE OverloadedStrings #-}
-+{-# LANGUAGE FlexibleContexts #-}
- {-
- Copyright (C) 2006-2014 John MacFarlane
-
-@@ -708,7 +709,7 @@
- toChunks :: String -> [String]
- toChunks = dropWhile null
- . map (trim . unlines)
-- . splitBy (all (`elem` " \t")) . lines
-+ . splitBy (all (`elem` (" \t" :: String))) . lines
-
- codeblock :: Maybe String -> String -> String -> RSTParser Blocks
- codeblock numberLines lang body =
---- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/TWiki.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Readers/TWiki.hs 2015-01-05 11:25:22.450138135 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances #-}
-+{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances, FlexibleContexts #-}
- -- RelaxedPolyRec needed for inlinesBetween on GHC < 7
- {-
- Copyright (C) 2014 Alexander Sulfrian
---- pandoc-1.13.2-orig/src/Text/Pandoc/Templates.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Templates.hs 2015-01-05 10:45:45.255969737 +1100
-@@ -124,7 +124,7 @@
- -> String -- ^ Name of writer
- -> IO (Either E.IOException String)
- getDefaultTemplate user writer = do
-- let format = takeWhile (`notElem` "+-") writer -- strip off extensions
-+ let format = takeWhile (`notElem` ("+-" :: String)) writer -- strip off extensions
- case format of
- "native" -> return $ Right ""
- "json" -> return $ Right ""
-@@ -288,7 +288,7 @@
- reservedWords = ["else","endif","for","endfor","sep"]
-
- skipEndline :: Parser ()
--skipEndline = P.try $ P.skipMany (P.satisfy (`elem` " \t")) >> P.char '\n' >> return ()
-+skipEndline = P.try $ P.skipMany (P.satisfy (`elem` (" \t" :: String))) >> P.char '\n' >> return ()
-
- pConditional :: Parser Template
- pConditional = do
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ConTeXt.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ConTeXt.hs 2015-01-05 11:36:04.213852145 +1100
-@@ -119,7 +119,7 @@
- toLabel :: String -> String
- toLabel z = concatMap go z
- where go x
-- | elem x "\\#[]\",{}%()|=" = "ux" ++ printf "%x" (ord x)
-+ | elem x ("\\#[]\",{}%()|=" :: String) = "ux" ++ printf "%x" (ord x)
- | otherwise = [x]
-
- -- | Convert Elements to ConTeXt
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/EPUB.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/EPUB.hs 2015-01-05 11:35:29.166882307 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns #-}
-+{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns, FlexibleContexts #-}
- {-
- Copyright (C) 2010-2014 John MacFarlane
-
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ICML.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ICML.hs 2015-01-05 11:35:07.163880901 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE OverloadedStrings #-}
-+{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
-
- {- |
- Module : Text.Pandoc.Writers.ICML
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/LaTeX.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/LaTeX.hs 2015-01-05 11:32:29.461099578 +1100
-@@ -240,7 +240,7 @@
- where go [] = ""
- go (x:xs)
- | (isLetter x || isDigit x) && isAscii x = x:go xs
-- | elem x "-+=:;." = x:go xs
-+ | elem x ("-+=:;." :: String) = x:go xs
- | otherwise = "ux" ++ printf "%x" (ord x) ++ go xs
-
- -- | Puts contents into LaTeX command.
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Markdown.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Markdown.hs 2015-01-05 11:34:25.437241616 +1100
-@@ -323,9 +323,9 @@
- then Just $ writerColumns opts
- else Nothing
- let rendered = render colwidth contents
-- let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs
-- | otherwise = x : escapeDelimiter xs
-- escapeDelimiter [] = []
-+ let escapeDelimiter (x:xs) | x `elem` (".()" :: String) = '\\':x:xs
-+ | otherwise = x : escapeDelimiter xs
-+ escapeDelimiter [] = []
- let contents' = if isEnabled Ext_all_symbols_escapable opts &&
- not (stPlain st) && beginsWithOrderedListMarker rendered
- then text $ escapeDelimiter rendered
-@@ -681,7 +681,7 @@
- mapM (inlineToMarkdown opts) (avoidBadWraps lst) >>= return . cat
- where avoidBadWraps [] = []
- avoidBadWraps (Space:Str (c:cs):xs)
-- | c `elem` "-*+>" = Str (' ':c:cs) : avoidBadWraps xs
-+ | c `elem` ("-*+>" :: String) = Str (' ':c:cs) : avoidBadWraps xs
- avoidBadWraps (x:xs) = x : avoidBadWraps xs
-
- escapeSpaces :: Inline -> Inline
-@@ -821,8 +821,8 @@
- sdoc <- inlineListToMarkdown opts sinlines
- let k' = text (modekey m ++ "@" ++ k)
- r = case sinlines of
-- Str (y:_):_ | y `elem` ",;]@" -> k' <> sdoc
-- _ -> k' <+> sdoc
-+ Str (y:_):_ | y `elem` (",;]@" :: String) -> k' <> sdoc
-+ _ -> k' <+> sdoc
- return $ pdoc <+> r
- modekey SuppressAuthor = "-"
- modekey _ = ""
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/OpenDocument.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/OpenDocument.hs 2015-01-05 11:36:22.915591722 +1100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE PatternGuards, OverloadedStrings #-}
-+{-# LANGUAGE PatternGuards, OverloadedStrings, FlexibleContexts #-}
- {-
- Copyright (C) 2008-2014 Andrea Rossato
- and John MacFarlane.
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/RST.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/RST.hs 2015-01-05 11:32:00.815007351 +1100
-@@ -105,7 +105,7 @@
- -> State WriterState Doc
- keyToRST (label, (src, _)) = do
- label' <- inlineListToRST label
-- let label'' = if ':' `elem` (render Nothing label')
-+ let label'' = if ':' `elem` ((render Nothing label') :: String)
- then char '`' <> label' <> char '`'
- else label'
- return $ nowrap $ ".. _" <> label'' <> ": " <> text src
-@@ -333,12 +333,12 @@
- okAfterComplex :: Inline -> Bool
- okAfterComplex Space = True
- okAfterComplex LineBreak = True
-- okAfterComplex (Str (c:_)) = isSpace c || c `elem` "-.,:;!?\\/'\")]}>–—"
-+ okAfterComplex (Str (c:_)) = isSpace c || c `elem` ("-.,:;!?\\/'\")]}>–—" :: String)
- okAfterComplex _ = False
- okBeforeComplex :: Inline -> Bool
- okBeforeComplex Space = True
- okBeforeComplex LineBreak = True
-- okBeforeComplex (Str (c:_)) = isSpace c || c `elem` "-:/'\"<([{–—"
-+ okBeforeComplex (Str (c:_)) = isSpace c || c `elem` ("-:/'\"<([{–—" :: String)
- okBeforeComplex _ = False
- isComplex :: Inline -> Bool
- isComplex (Emph _) = True
---- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Texinfo.hs 2014-12-20 19:18:27.000000000 +1100
-+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Texinfo.hs 2015-01-05 11:33:07.407217820 +1100
-@@ -368,7 +368,7 @@
-
- -- periods, commas, colons, and parentheses are disallowed in node names
- disallowedInNode :: Char -> Bool
--disallowedInNode c = c `elem` ".,:()"
-+disallowedInNode c = c `elem` (".,:()" :: String)
-
- -- | Convert inline element to Texinfo
- inlineToTexinfo :: Inline -- ^ Inline to convert
diff --git a/app-text/pandoc/pandoc-1.12.1-r1.ebuild b/app-text/pandoc/pandoc-1.12.1-r1.ebuild
deleted file mode 100644
index 280068ddc542..000000000000
--- a/app-text/pandoc/pandoc-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Conversion between markup formats"
-HOMEPAGE="http://johnmacfarlane.net/pandoc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="embed_data_files +http-conduit"
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] =dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/base64-bytestring-0.1:=[profile?] =dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/data-default-0.4:=[profile?] =dev-haskell/extensible-exceptions-0.1:=[profile?] =dev-haskell/highlighting-kate-0.5.5:=[profile?] =dev-haskell/hslua-0.3:=[profile?] =dev-haskell/http-4000.0.5:=[profile?] =dev-haskell/mtl-1.1:=[profile?] =dev-haskell/network-2:=[profile?] =dev-haskell/pandoc-types-1.12.3:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-haskell/tagsoup-0.12.5:=[profile?] =dev-haskell/temporary-1.1:=[profile?] =dev-haskell/texmath-0.6.4:=[profile?] =dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-haskell/xml-1.3.12:=[profile?] =dev-haskell/yaml-0.8.3:=[profile?] =dev-haskell/zip-archive-0.1.3.3:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-7.0.1:=
- embed_data_files? ( dev-haskell/hsb2hs )
- http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] =dev-haskell/http-types-0.8:=[profile?] =dev-haskell/cabal-1.10.0.0
- dev-haskell/happy
- test? ( >=dev-haskell/ansi-terminal-0.5 =dev-haskell/diff-0.2 =dev-haskell/hunit-1.2 =dev-haskell/quickcheck-2.4 =dev-haskell/test-framework-0.3 =dev-haskell/test-framework-hunit-0.2 =dev-haskell/test-framework-quickcheck2-0.2.9 = 0.11 && < 0.12' 'text >= 0.11'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag embed_data_files embed_data_files) \
- $(cabal_flag http-conduit http-conduit)
-}
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 250b28ec1d98..163c875d212b 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos"
IUSE=""
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
index 75f8e2f78b33..acf402f684ab 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="nls"
RDEPEND="sys-libs/zlib
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
index 206db1270e3f..da89e6fa6372 100644
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="emacs tk vim-syntax"
DEPEND="${PYTHON_DEPS}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index ff6e7f27e767..8e597eb5c021 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,4 @@
DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40671475e13252a71a53a01f80d172ef SHA512 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428 WHIRLPOOL 522833f6dc47693885238caac1da80141d909a2c7c89bc5f302e064f5ebded132329000a223f9a11b412adea25c412ff4a99c0f5de9cf25582e62dca02a3bae6
-DIST xapian-omega-1.3.5.tar.xz 486076 SHA256 f7a549cecd85fcecf0ec087fe7d839ce6d712b1c25fd1988c80f19df8958f47a SHA512 a063c9584487321a27393bb531dc807d53e572ae439938fd9dd584d7f0970366eaa20ae18200bdafd22aea5e30000f932dde390f123d39d90ade1b7934bbfc10 WHIRLPOOL 7c0f02a2122bcf0c0c2fbd8692f138de73ce5e01bf01eb6d7a2c8e4459dbaa91f9e98a6ffa9cc8e9efa0b31b312191ecdb7743c960238cec762278087cda10b7
DIST xapian-omega-1.3.6.tar.xz 486352 SHA256 ffa5a151b827e8227d47cadacbdb18854e6d339bf6595892cc304f9a4e3d8abb SHA512 78e607880343d056cac777d0e1b59f89a405fd190c16554322e2e289ffdde0a537238e013ded2fe7c10b6cabfed86360fe0c022c185d896822eb968945886000 WHIRLPOOL b0035a987df4bfc34abc68c658c01a804327d6c1ea87e687a20675f03cb208dec421775e124b55d4a1cd624d82432ad89b3a45c5e77eaed3e8d67cd909420217
diff --git a/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch b/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
deleted file mode 100644
index e8126baf0d51..000000000000
--- a/app-text/xapian-omega/files/xapian-omega-1.3.4-fix-lz.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 755169cc3b0991bb783ade963da3a473db147067
-Author: Olly Betts
-Date: Tue Jan 12 17:24:11 2016 +1300
-
- Need to AC_SUBST probed value of ZLIB_LIBS
-
- Noted by Paul Wise
-
-diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac
-index db56262..36d894e 100644
---- a/xapian-applications/omega/configure.ac
-+++ b/xapian-applications/omega/configure.ac
-@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [
- AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you may need to install the zlib1g-dev or zlib-devel package)])
- ])
- ZLIB_LIBS=$LIBS
-+AC_SUBST([ZLIB_LIBS])
- LIBS=$SAVE_LIBS
-
- dnl libmagic used to detect MIME types for files we don't detect by extension.
diff --git a/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild b/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
deleted file mode 100644
index 85772bb1e0bd..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/1.3.6
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- # Protect /etc/omega.conf
- echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
- doenvd "${T}"/20xapian-omega
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
-
- # Directory containing Xapian databases:
- keepdir /var/lib/omega/data
-
- # Directory containing OmegaScript templates:
- keepdir /var/lib/omega/templates
- mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
- # Directory to write Omega logs to:
- keepdir /var/log/omega
-
- # Directory containing any cdb files for the $lookup OmegaScript command:
- keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
index c65c5602c834..e3322f118fdd 100644
--- a/app-text/xchm/xchm-1.23-r1.ebuild
+++ b/app-text/xchm/xchm-1.23-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-vim/ackvim/ackvim-1.0.9.ebuild b/app-vim/ackvim/ackvim-1.0.9.ebuild
index 62f42a6c1785..211d2d63c3dd 100644
--- a/app-vim/ackvim/ackvim-1.0.9.ebuild
+++ b/app-vim/ackvim/ackvim-1.0.9.ebuild
@@ -15,10 +15,7 @@ SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.zip -> ${MY_P}.zip"
LICENSE="vim"
KEYWORDS="~amd64 ~x86"
-DEPEND="
- sys-apps/ack
- app-arch/unzip"
-
-RDEPEND="${DEPEND}"
+DEPEND="app-arch/unzip"
+RDEPEND="sys-apps/ack"
S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
new file mode 100644
index 000000000000..2c3e36887c7e
--- /dev/null
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: GNU info documentation browser"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=21"
+LICENSE="BSD"
+KEYWORDS="~x86 ~alpha ~sparc ~ia64 ~ppc ~s390 ~amd64"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
+
+src_prepare() {
+ default
+
+ # The 'h' key is a bad choice for help. 'H' would have been a
+ # much better choice. I sent this suggestion to the maintainer,
+ # but no reply.
+ sed -i 's/\(noremap \)h/\1H/' plugin/info.vim || die 'sed failed'
+}
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
index 6d5a259075f1..7a8ad4a5b308 100644
--- a/app-vim/pydiction/Manifest
+++ b/app-vim/pydiction/Manifest
@@ -1 +1 @@
-DIST pydiction-1.2.3.zip 476599 SHA256 0998a06be1741edfb1261944ede6fbad77c3742d8924b57ec3ec80908a22b522 SHA512 20e553cb8fdc541e619936f80d8e808484e265d96d1223a7558770e453ad186d5d0057a8b25cd5707bf80b56e40c885097e4195fd66fea2afd8b6d83f84d9441 WHIRLPOOL b1fab3728637dd2ec780f6174790315b478b37eda8000a22891e75cd8a7e04b8f4255cee8ae9e249c18cf03a7beac7f8e650eed40fe345a68d59e2294435b1e2
+DIST pydiction-1.2.3.zip 475441 SHA256 fa5ca8fcd67bd5f7ff7d000e3e0e7d6565d5c298f1d9cf7d0424afad12b8c283 SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922 WHIRLPOOL ffc9051eee429263b6037e09f16145704b5f7b209830ac1280cc10e56519ae3149532226bce38e12e8cdd5668ff8c67c80996129946afb9ffa075ffab2b16eae
diff --git a/app-vim/pydiction/pydiction-1.2.3.ebuild b/app-vim/pydiction/pydiction-1.2.3.ebuild
index f22c4d243e0e..25861af3e4d3 100644
--- a/app-vim/pydiction/pydiction-1.2.3.ebuild
+++ b/app-vim/pydiction/pydiction-1.2.3.ebuild
@@ -12,13 +12,10 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
LICENSE="vim"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-DEPEND="
- dev-lang/python:*
- app-arch/unzip"
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-master"
src_install() {
insinto "/usr/share/${PN}"
diff --git a/app-vim/uptime/uptime-1.3-r1.ebuild b/app-vim/uptime/uptime-1.3-r1.ebuild
index 63832d8a8218..d9d4fb0b7892 100644
--- a/app-vim/uptime/uptime-1.3-r1.ebuild
+++ b/app-vim/uptime/uptime-1.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: display vim uptimes"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=965"
LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
IUSE=""
VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/uptime/uptime-1.3.ebuild b/app-vim/uptime/uptime-1.3.ebuild
deleted file mode 100644
index 98cac85c5aff..000000000000
--- a/app-vim/uptime/uptime-1.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: display vim uptimes"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=965"
-LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vimpython/vimpython-1.13-r1.ebuild b/app-vim/vimpython/vimpython-1.13-r1.ebuild
index d677672a3605..5fee62b619ba 100644
--- a/app-vim/vimpython/vimpython-1.13-r1.ebuild
+++ b/app-vim/vimpython/vimpython-1.13-r1.ebuild
@@ -9,4 +9,7 @@ inherit vim-plugin
DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=30"
LICENSE="vim"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
diff --git a/app-vim/vimpython/vimpython-1.13.ebuild b/app-vim/vimpython/vimpython-1.13.ebuild
deleted file mode 100644
index 5a27e29deefc..000000000000
--- a/app-vim/vimpython/vimpython-1.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VIM_PLUGIN_VIM_VERSION="7.0"
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=30"
-
-LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="${DEPEND}"
-
-VIM_PLUGIN_HELPURI="${HOMEPAGE}"
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
similarity index 82%
rename from app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
rename to app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
index b3d118a7956c..51769ae94928 100644
--- a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
+EAPI=6
+
inherit vim-plugin
DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
LICENSE="CC-BY-SA-3.0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 hppa mips ppc ppc64 x86"
IUSE=""
VIM_PLUGIN_HELPTEXT=\
"This plugin provides syntax highlighting for Wikipedia article
files. Detection is by filename (*.wiki)."
+
VIM_PLUGIN_MESSAGES="filetype"
diff --git a/dev-cpp/asio/asio-1.4.8-r1.ebuild b/dev-cpp/asio/asio-1.4.8-r1.ebuild
index dc5a7d52aaa5..8596463b07f5 100644
--- a/dev-cpp/asio/asio-1.4.8-r1.ebuild
+++ b/dev-cpp/asio/asio-1.4.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc examples ssl test"
RDEPEND="ssl? ( dev-libs/openssl )
diff --git a/dev-cpp/tree/tree-2.81.ebuild b/dev-cpp/tree/tree-2.81.ebuild
index cbfe8e2fbbdb..3049fdcf1189 100644
--- a/dev-cpp/tree/tree-2.81.ebuild
+++ b/dev-cpp/tree/tree-2.81.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc"
S="${S}"/src
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index afa033f2a0e5..f7999d6f2272 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -13,3 +13,4 @@ DIST postgresql-9.4.6.tar.bz2 17734946 SHA256 cbce1f4d01a6142c5d8bebe125623c5198
DIST postgresql-9.4.7.tar.bz2 17746987 SHA256 cc795e6c35b30e697e5891e3056376af685f848a4e67fab1702e74a2385f81e0 SHA512 e61d74a4a9caeb7d4a3fb9509b37aaeb5bd563d61d20739edd777ec990c92011286a7485f275178f9f8c1ebb8c84a98290e2b5351b11e0f9a1baa781f323e374 WHIRLPOOL 2ae25affc35e12fd250161585bc5cf318930d9864c9fccbf44c9bd697933aa75860467256b811501947c0fad8c6cdc0622889e9991904a4db9fda2d19efa2b37
DIST postgresql-9.5.1.tar.bz2 18441638 SHA256 6b309d8506a39773a752ff074f47656e5424576ea090b04a24fe1725958c5bd2 SHA512 fcb2b3bde51c4152b3a72764de1f9b4e607cb591571ed5bc1187b2c6938c33e21bdd512694a969a03c046e4889a129bb0e75fa676d55a1a1e77142da1e984192 WHIRLPOOL 2fdbae2c58ce4255b514055ada220b25269a01719c202e1d1ae86d408fd56b523f1a4e16ef5abd675b0fbf0675c1eabca7d0f5f2e8fdb9cdc3a3d98e7b755aeb
DIST postgresql-9.5.2.tar.bz2 18446616 SHA256 f8d132e464506b551ef498719f18cfe9d777709c7a1589dc360afc0b20e47c41 SHA512 ba31dddee8a960a4b1a97394eae5ea7efaa5e74e21c755882efcef90404676c6052dff55f40b585932e4f752cbcda5ceac0e29d601ea6651cfbab7a49190381a WHIRLPOOL 0b9abe3a5b3933485e5d0b2c08daa20d421e5920ae5b4640b36971463915d7e7b2767575564d80bb5dfa3a353c646c9c4ca8e483dfd64df39370774e76fa1cee
+DIST postgresql-9.6beta1.tar.bz2 19059162 SHA256 e1cec9a7bd10e7941cadec8613c642cdfd4a0f091767a2653c57d8d0ccbf6738 SHA512 26fecc0d5e8578ee66e3749af42ce822ba3648103fac7df91e9581a3625af02a132fd4d2a7652ef309faa41ad489e5c9bb9ed60f902c844f1a7f2d9be5481141 WHIRLPOOL 46dc16b3efd9a5886695ed4e54adb73b8d341932c7e87f267aaa2f4e7965e938a29f9b85936a3905ce740b2129170f3df6f9449b0867214abe743fc613c4b411
diff --git a/dev-db/postgresql/postgresql-9.6_beta1.ebuild b/dev-db/postgresql/postgresql-9.6_beta1.ebuild
new file mode 100644
index 000000000000..cc156361318b
--- /dev/null
+++ b/dev-db/postgresql/postgresql-9.6_beta1.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
+ systemd user versionator
+
+KEYWORDS=""
+
+SLOT="$(get_version_component_range 1-2)"
+
+MY_PV=${PV/_/}
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2"
+
+LICENSE="POSTGRESQL GPL-2"
+DESCRIPTION="PostgreSQL RDBMS"
+HOMEPAGE="http://www.postgresql.org/"
+
+LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
+ zh_CN zh_TW"
+IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
+ +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+wanted_languages() {
+ local enable_langs
+
+ for lingua in ${LINGUAS} ; do
+ use linguas_${lingua} && enable_langs+="${lingua} "
+ done
+
+ echo -n ${enable_langs}
+}
+
+CDEPEND="
+>=app-eselect/eselect-postgresql-1.2.0
+sys-apps/less
+virtual/libintl
+kerberos? ( virtual/krb5 )
+ldap? ( net-nds/openldap )
+pam? ( virtual/pam )
+perl? ( >=dev-lang/perl-5.8 )
+python? ( ${PYTHON_DEPS} )
+readline? ( sys-libs/readline:0= )
+ssl? (
+ !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
+ libressl? ( dev-libs/libressl:= )
+)
+tcl? ( >=dev-lang/tcl-8:0= )
+xml? ( dev-libs/libxml2 dev-libs/libxslt )
+zlib? ( sys-libs/zlib )
+"
+
+# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
+# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
+# the libc includes UUID functions.
+UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
+BSD_LIBC=( elibc_{Free,Net,Open}BSD )
+
+nest_usedep() {
+ local front back
+ while [[ ${#} -gt 1 ]]; do
+ front+="${1}? ( "
+ back+=" )"
+ shift
+ done
+ echo "${front}${1}${back}"
+}
+
+IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
+CDEPEND+="
+uuid? (
+ ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
+ $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
+)"
+
+DEPEND="${CDEPEND}
+!! \
+ "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use doc ; then
+ docinto html
+ dodoc doc/src/sgml/html/*
+
+ docinto sgml
+ dodoc doc/src/sgml/*.{sgml,dsl}
+ fi
+
+ if use server; then
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
+
+ sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
+ "${FILESDIR}/${PN}.service" | \
+ systemd_newunit - ${PN}-${SLOT}.service
+
+ newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
+
+ use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
+
+ if use prefix ; then
+ keepdir /run/postgresql
+ fperms 0775 /run/postgresql
+ fi
+ fi
+}
+
+pkg_postinst() {
+ postgresql-config update
+
+ elog "If you need a global psqlrc-file, you can place it in:"
+ elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ elog "It looks like this is your first time installing PostgreSQL. Run the"
+ elog "following command in all active shells to pick up changes to the default"
+ elog "environment:"
+ elog " source /etc/profile"
+ fi
+
+ if use server ; then
+ elog
+ elog "Gentoo specific documentation:"
+ elog "https://wiki.gentoo.org/wiki/PostgreSQL"
+ elog
+ elog "Official documentation:"
+ elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog
+ elog "The default location of the Unix-domain socket is:"
+ elog " ${EROOT%/}/run/postgresql/"
+ elog
+ elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
+ elog "so that it contains your preferred locale in:"
+ elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ elog
+ elog "Then, execute the following command to setup the initial database"
+ elog "environment:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+ fi
+}
+
+pkg_prerm() {
+ if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
+ ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
+ ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
+
+ ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
+ sleep 10
+ eend 0
+ fi
+}
+
+pkg_postrm() {
+ postgresql-config update
+}
+
+pkg_config() {
+ use server || die "USE flag 'server' not enabled. Nothing to configure."
+
+ [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
+ && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+ [[ -z "${DATA_DIR}" ]] \
+ && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+
+ # environment.bz2 may not contain the same locale as the current system
+ # locale. Unset and source from the current system locale.
+ if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+ unset LANG
+ unset LC_CTYPE
+ unset LC_NUMERIC
+ unset LC_TIME
+ unset LC_COLLATE
+ unset LC_MONETARY
+ unset LC_MESSAGES
+ unset LC_ALL
+ source "${EROOT%/}/etc/env.d/02locale"
+ [ -n "${LANG}" ] && export LANG
+ [ -n "${LC_CTYPE}" ] && export LC_CTYPE
+ [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
+ [ -n "${LC_TIME}" ] && export LC_TIME
+ [ -n "${LC_COLLATE}" ] && export LC_COLLATE
+ [ -n "${LC_MONETARY}" ] && export LC_MONETARY
+ [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
+ [ -n "${LC_ALL}" ] && export LC_ALL
+ fi
+
+ einfo "You can modify the paths and options passed to initdb by editing:"
+ einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+ einfo
+ einfo "Information on options that can be passed to initdb are found at:"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo
+ einfo "PG_INITDB_OPTS is currently set to:"
+ if [[ -z "${PG_INITDB_OPTS}" ]] ; then
+ einfo " (none)"
+ else
+ einfo " ${PG_INITDB_OPTS}"
+ fi
+ einfo
+ einfo "Configuration files will be installed to:"
+ einfo " ${PGDATA}"
+ einfo
+ einfo "The database cluster will be created in:"
+ einfo " ${DATA_DIR}"
+ einfo
+ while [ "$correct" != "true" ] ; do
+ einfo "Are you ready to continue? (y/n)"
+ read answer
+ if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
+ correct="true"
+ elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
+ die "Aborting initialization."
+ else
+ echo "Answer not recognized"
+ fi
+ done
+
+ if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
+ eerror "The given directory, '${DATA_DIR}', is not empty."
+ eerror "Modify DATA_DIR to point to an empty directory."
+ die "${DATA_DIR} is not empty."
+ fi
+
+ einfo "Creating the data directory ..."
+ if [[ ${EUID} == 0 ]] ; then
+ mkdir -p "${DATA_DIR}"
+ chown -Rf postgres:postgres "${DATA_DIR}"
+ chmod 0700 "${DATA_DIR}"
+ fi
+
+ einfo "Initializing the database ..."
+
+ if [[ ${EUID} == 0 ]] ; then
+ su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+ else
+ "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+ fi
+
+ if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
+ mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
+ ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
+ fi
+
+ cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
+ # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
+ # On the off-chance that you might need to work with UTF-8 encoded
+ # characters in PL/Perl
+ plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
+ EOF
+
+ einfo "The autovacuum function, which was in contrib, has been moved to the main"
+ einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
+ einfo "by default. You can disable it in the cluster's:"
+ einfo " ${PGDATA%/}/postgresql.conf"
+ einfo
+ einfo "The PostgreSQL server, by default, will log events to:"
+ einfo " ${DATA_DIR%/}/postmaster.log"
+ einfo
+ if use prefix ; then
+ einfo "The location of the configuration files have moved to:"
+ einfo " ${PGDATA}"
+ einfo "To start the server:"
+ einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
+ einfo "To stop:"
+ einfo " pg_ctl stop -D ${DATA_DIR}"
+ einfo
+ einfo "Or move the configuration files back:"
+ einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
+ else
+ einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+ einfo "instead of 'pg_ctl'."
+ fi
+}
+
+src_test() {
+ einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+
+ if use server && [[ ${UID} -ne 0 ]] ; then
+ emake check
+
+ einfo "If you think other tests besides the regression tests are necessary, please"
+ einfo "submit a bug including a patch for this ebuild to enable them."
+ else
+ use server || \
+ ewarn 'Tests cannot be run without the "server" use flag enabled.'
+ [[ ${UID} -eq 0 ]] || \
+ ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
+
+ ewarn 'Skipping.'
+ fi
+}
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index f3ff28eff02a..adda706257d4 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit base eutils flag-o-matic git-2 linux-info multilib pam prefix \
+inherit eutils flag-o-matic git-2 linux-info multilib pam prefix \
python-single-r1 systemd user versionator
KEYWORDS=""
diff --git a/dev-games/goatee/Manifest b/dev-games/goatee/Manifest
index 9545a184e49e..3b3a6c9caf74 100644
--- a/dev-games/goatee/Manifest
+++ b/dev-games/goatee/Manifest
@@ -1 +1,2 @@
DIST goatee-0.3.0.tar.gz 83679 SHA256 4d2ca32cf42161e18d3c528c24d0ac16a78b0e331759ce97714d5abcab65c0df SHA512 57c5340ba6aadbd4fd5d328702012e02a5e36c50be7f714bc1f8adedb3270c2174ad3c60d30dd7b93b93b4a3a3e6436ec9e5957561e13046dfde869b71ec2cd6 WHIRLPOOL bff45c30c33ea0e2e82fcf138d2b99de96b459c67fbdf952c4cc94e115e416b0733751dafeacfbd3738a7295dc99583449f2a56db9f50eb2a039de0981870eae
+DIST goatee-0.3.1.1.tar.gz 84493 SHA256 88837cda9add9a05ca6f8bf8c0547f6cc629253f6e033b198e27142735074ce2 SHA512 cc08009476a9f5d670874f3a4417d9c1c942e7c38ad88fe45dccc008585ad9e4d7cc3db61eeb84ebb65ff31cec7ba387a6ab5f27490152796a148b6bca3a47c0 WHIRLPOOL 07fd2df0db169fb27eab730beb8dac5f640a08981e9e5555e957b02e601eba5f0374eee31c85fa35351cbd70ee054278a0e38cbf19b35b60a9bde314b79f2ce5
diff --git a/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch b/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
new file mode 100644
index 000000000000..e2881220fec4
--- /dev/null
+++ b/dev-games/goatee/files/goatee-0.3.0-ghc-7.10.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/Game/Goatee/CommonTest.hs b/tests/Game/Goatee/CommonTest.hs
+index bf27662..33e4f24 100644
+--- a/tests/Game/Goatee/CommonTest.hs
++++ b/tests/Game/Goatee/CommonTest.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- This file is part of Goatee.
+diff --git a/tests/Game/Goatee/Lib/MonadTest.hs b/tests/Game/Goatee/Lib/MonadTest.hs
+index c5b505f..bf10f4e 100644
+--- a/tests/Game/Goatee/Lib/MonadTest.hs
++++ b/tests/Game/Goatee/Lib/MonadTest.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- This file is part of Goatee.
diff --git a/dev-games/goatee/goatee-0.3.0.ebuild b/dev-games/goatee/goatee-0.3.0.ebuild
index 00d0b9ca4d24..9d00fc1b4cb1 100644
--- a/dev-games/goatee/goatee-0.3.0.ebuild
+++ b/dev-games/goatee/goatee-0.3.0.ebuild
@@ -24,5 +24,12 @@ RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] = 1.2 && < 1.3' 'HUnit >= 1.2'
+}
diff --git a/dev-games/goatee/goatee-0.3.1.1.ebuild b/dev-games/goatee/goatee-0.3.1.1.ebuild
new file mode 100644
index 000000000000..2e5839a94afa
--- /dev/null
+++ b/dev-games/goatee/goatee-0.3.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A monadic take on a 2,500-year-old board game - library"
+HOMEPAGE="http://khumba.net/projects/goatee"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'HUnit >= 1.2 && < 1.3' 'HUnit >= 1.2'
+}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 57f8d7aad943..098b09d131a7 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,2 +1,2 @@
-DIST tiled-0.15.2.tar.gz 3004096 SHA256 af662bba4d7b930717359484da4f3cae0ae004d0a9e51f0eeb04704cefd74ee1 SHA512 0c866ad6733ed37a60967f9826d632e4e72669289329b8db0799dafc99b95a18ec3c9e9b454ea925f4289b6d05e06268533858c8b02f7b43a224a64255a7c214 WHIRLPOOL c920f8cd7130fc055eb08bb550439e473a638a6a305eee1b70af59f1294ff25b0511c40707538200438e857f45f9909059792bf8b9bfe39849262c5eb6767187
DIST tiled-0.16.0.tar.gz 4485752 SHA256 c02df78021c07c5574a8b52fcb61a02649db039724f13ecacdd18840df7490ee SHA512 4850127fd05f477b47df3d44a25e457eade4719b2d6e295eb5e220574e8b0009c7b9b9972679b5ef539ec63c8ecc56c12be6f24e1cc611714ca8d4d9769150f3 WHIRLPOOL f42aa6dd38a223ba385a69a6f7f2e2fe2e99c4a65da2c59b915b2fe2ba9a597670f7737f57c23e2a1cb9c4b058143779c110c9c9dfdf1f833e84c5491a78c253
+DIST tiled-0.16.1.tar.gz 4506022 SHA256 c666627fc243d27fb879d85b9de841b5c82d1363f93204e5f72afd50a1373168 SHA512 425cbdc66132312326b9edc0cf4aa24116cfb0a2f89c1a51107f8bdfbf4f8c41ba450a8a3737867b2fc8bda43cfb66669e488b3c540911e60860086365939d62 WHIRLPOOL 2aea640f6a725194d7b980481d01b8b1802349a031cf8b07baf6f58cf8bc668516ef03cc1feb1275a8ea565ba0b3e200494fc677add7ada0fc20b6ddae74009b
diff --git a/dev-games/tiled/tiled-0.16.0.ebuild b/dev-games/tiled/tiled-0.16.0.ebuild
index 0795f0bebabc..b2e80ad566c6 100644
--- a/dev-games/tiled/tiled-0.16.0.ebuild
+++ b/dev-games/tiled/tiled-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-games/tiled/tiled-0.15.2.ebuild b/dev-games/tiled/tiled-0.16.1.ebuild
similarity index 98%
rename from dev-games/tiled/tiled-0.15.2.ebuild
rename to dev-games/tiled/tiled-0.16.1.ebuild
index d9d03ea6a369..0795f0bebabc 100644
--- a/dev-games/tiled/tiled-0.15.2.ebuild
+++ b/dev-games/tiled/tiled-0.16.1.ebuild
@@ -21,6 +21,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtwidgets:5
sys-libs/zlib
diff --git a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
index f78eb7e7a82e..dc6c5e74de6d 100644
--- a/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
+++ b/dev-haskell/adjunctions/adjunctions-4.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/comonad-4:=[profile?] test-framework->text->xml->binary
diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
index c5c76e859d02..cda82e21d25e 100644
--- a/dev-haskell/c2hs/c2hs-0.27.1.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.27.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="regression"
RDEPEND="dev-haskell/dlist:=
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
index 236d3cc3fe1f..102f22157bcb 100644
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+network-uri +noprefs"
RESTRICT=test # missing files
diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
index 05543815fbd0..69b8eedaa67e 100644
--- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild
+++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild
@@ -22,6 +22,8 @@ SLOT="0/${PV}"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
+RESTRICT=test # circular depend: cabal[test]->quickcheck[test]->cabal
+
RDEPEND=">=dev-lang/ghc-6.12.1:="
DEPEND="${RDEPEND}
test? ( dev-haskell/extensible-exceptions
diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
index 2018c4615bb5..d7be63255b12 100644
--- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RESTRICT=test
diff --git a/dev-haskell/cairo/cairo-0.13.1.1.ebuild b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
index bfd1e931a04d..7b0b296e434b 100644
--- a/dev-haskell/cairo/cairo-0.13.1.1.ebuild
+++ b/dev-haskell/cairo/cairo-0.13.1.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+pdf +postscript +svg"
RDEPEND="dev-haskell/mtl:=[profile?]
diff --git a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
index 16e785ff9306..d651ce93f198 100644
--- a/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
+++ b/dev-haskell/case-insensitive/case-insensitive-1.2.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/hashable-1.0:=[profile?] =dev-haskell/network-2.4:=[profile?]
- dev-haskell/network-uri:=[profile?]
- dev-haskell/puremd5:=[profile?]
- =dev-haskell/quickcheck-2*:2=[profile?]
- dev-haskell/random:=[profile?]
- dev-haskell/regex-compat:=[profile?]
- >=dev-haskell/unixutils-1.51:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- cabal_chdeps \
- 'network >= 2.4' 'network >= 2.4, network-uri'
-}
diff --git a/dev-haskell/extra/extra-1.46.3.ebuild b/dev-haskell/extra/extra-1.46.3.ebuild
deleted file mode 100644
index 551557e39da5..000000000000
--- a/dev-haskell/extra/extra-1.46.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="Extra"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A grab bag of modules"
-HOMEPAGE="https://github.com/ddssff/haskell-extra"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND="dev-haskell/bzlib:=[profile?]
- dev-haskell/hunit:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/old-locale:=[profile?]
- dev-haskell/old-time:=[profile?]
- dev-haskell/puremd5:=[profile?]
- >=dev-haskell/quickcheck-2:2=[profile?] =dev-haskell/unixutils-1.51:=[profile?]
- dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.4.1:=
- network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
- !network-uri? ( >=dev-haskell/network-2.4:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index b9cbd5036f75..7bcf2b68f1eb 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -5,13 +5,7 @@
haskell@gentoo.org
Gentoo Haskell
-
- A hodge-podge of functions and modules that do not have a better home
-
-
- ddssff/haskell-extra
+ ndmitchell/extra
diff --git a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
index 95f1d42c96a6..cd6ad7b18b8a 100644
--- a/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
+++ b/dev-haskell/fast-logger/fast-logger-2.4.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/auto-update-0.1.2:=[profile?]
diff --git a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
index 4a0311cfe4d5..8a55ea27a798 100644
--- a/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
+++ b/dev-haskell/fgl-arbitrary/fgl-arbitrary-0.2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/fgl-5.5.2.0:=[profile?] hspec[test]->hspec-expectations
+
RDEPEND="dev-haskell/hunit:=[profile?]
>=dev-lang/ghc-7.4.1:=
"
diff --git a/dev-haskell/hspec/hspec-2.1.4.ebuild b/dev-haskell/hspec/hspec-2.1.4.ebuild
index 4348cd15e79f..49dcd5bfea26 100644
--- a/dev-haskell/hspec/hspec-2.1.4.ebuild
+++ b/dev-haskell/hspec/hspec-2.1.4.ebuild
@@ -18,6 +18,8 @@ SLOT="0/${PV}"
KEYWORDS="amd64 x86"
IUSE=""
+RESTRICT=test # circular depend: hspec[test]->stringbuider[test]->hspec
+
RDEPEND="~dev-haskell/hspec-core-2.1.4:=[profile?]
~dev-haskell/hspec-discover-2.1.4:=[profile?]
>=dev-haskell/hspec-expectations-0.6.1:=[profile?] =dev-haskell/asn1-data-0.5.1:=[profile?]
- >=dev-haskell/base64-bytestring-0.1:=[profile?]
- >=dev-haskell/blaze-builder-0.2.1:=[profile?]
- >=dev-haskell/blaze-builder-conduit-0.5:=[profile?]
- >=dev-haskell/case-insensitive-0.2:=[profile?]
- >=dev-haskell/certificate-1.3:=[profile?]
- >=dev-haskell/conduit-0.5.5:=[profile?] =dev-haskell/cookie-0.4:=[profile?]
- dev-haskell/data-default:=[profile?]
- >=dev-haskell/failure-0.1:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?]
- >=dev-haskell/mime-types-0.1:=[profile?]
- >=dev-haskell/monad-control-0.3:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/publicsuffixlist-0.0.3:=[profile?] =dev-haskell/resourcet-0.3:=[profile?] =dev-haskell/socks-0.4:=[profile?]
- dev-haskell/text:=[profile?]
- >=dev-haskell/tls-extra-0.5.0:=[profile?]
- >=dev-haskell/transformers-0.2:=[profile?]
- >=dev-haskell/transformers-base-0.4:=[profile?]
- >=dev-haskell/utf8-string-0.3.4:=[profile?]
- >=dev-haskell/void-0.5.5:=[profile?]
- >=dev-haskell/zlib-conduit-0.5:=[profile?] =dev-lang/ghc-6.12.1:=
- >=dev-haskell/network-2.3:=[profile?]
- >=dev-haskell/cprng-aes-0.5.0:=[profile?]
- >=dev-haskell/tls-1.1.3:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8.0.2
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/hunit
- >=dev-haskell/network-conduit-0.6
- dev-haskell/wai
- >=dev-haskell/warp-1.3.6 )
-"
diff --git a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild b/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
deleted file mode 100644
index 5c0365ce311b..000000000000
--- a/dev-haskell/http-conduit/http-conduit-2.1.7.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP client package with conduit interface and HTTPS support"
-HOMEPAGE="http://www.yesodweb.com/book/http-conduit"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-0.5.5:=[profile?] =dev-haskell/http-client-0.4.3:=[profile?] =dev-haskell/http-client-tls-0.2.2:=[profile?]
- >=dev-haskell/http-types-0.7:=[profile?]
- >=dev-haskell/lifted-base-0.1:=[profile?]
- dev-haskell/monad-control:=[profile?]
- dev-haskell/mtl:=[profile?]
- >=dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/transformers-0.2:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/blaze-builder
- dev-haskell/case-insensitive
- >=dev-haskell/conduit-1.1
- dev-haskell/conduit-extra
- >=dev-haskell/connection-0.2
- dev-haskell/cookie
- dev-haskell/data-default-class
- >=dev-haskell/hspec-1.3
- dev-haskell/hunit
- dev-haskell/network
- dev-haskell/streaming-commons
- dev-haskell/text
- dev-haskell/utf8-string
- >=dev-haskell/wai-3.0 =dev-haskell/warp-3.0.0.2 silently[test]->nanospec
+
RDEPEND=">=dev-lang/ghc-7.4.1:=
"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/nats/nats-1.ebuild b/dev-haskell/nats/nats-1.ebuild
index c65991d6bf53..74cfbf524781 100644
--- a/dev-haskell/nats/nats-1.ebuild
+++ b/dev-haskell/nats/nats-1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+hashable"
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-haskell/newtype/newtype-0.2.ebuild b/dev-haskell/newtype/newtype-0.2.ebuild
index e2e8893aef29..54abc2154e82 100644
--- a/dev-haskell/newtype/newtype-0.2.ebuild
+++ b/dev-haskell/newtype/newtype-0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/openal/Manifest b/dev-haskell/openal/Manifest
index 41c84d49f189..4fa7f1024159 100644
--- a/dev-haskell/openal/Manifest
+++ b/dev-haskell/openal/Manifest
@@ -1,4 +1,3 @@
-DIST OpenAL-1.3.1.1.tar.gz 109173 SHA256 4875e015770feb93d5127d4b6f2338eb3957a0c36f64ccb8b3846010619f89b0 SHA512 2a31e868329c8ddd0c5c0e20215571e6f8edc525da04f6cc9323d691ea934f3fee3df1278b8e57c9dd0f5f4052e0cead295b49e6c39fa266afd8ce6768691b30 WHIRLPOOL 75ef381d48ace5f105630940bc107466e96e180205fc46c1292e83d23992ee04a9635fc37cdff7d56602047f5dd5d62a41e83f58a3fd3693f98e3678d350af8e
DIST OpenAL-1.4.0.2.tar.gz 116835 SHA256 7febf0d9ab1832275208ca1387fb238e5452e363e0978420066370114bbb04a7 SHA512 33075901fab42af8b91c0c46c590ddc5d1409c0ef2d49dfb1aa6f9b584ac3b8aa1f099cb9d5fdbf84905a9a1f689c3c0a389954db36b06b0eef5e1ceaef5928a WHIRLPOOL b8e7b8f39de22b757a7eca5c7a58837fd7d0afe1539b9a80af91ac2a44174042f148abcdf7adede3b8185d5918d278fa8c61cfc0b1479b2316c70965a5c8900e
DIST OpenAL-1.6.0.0.tar.gz 41111 SHA256 ed919152957ce4d5f81f4835d42dc709e370cf77595b522379236e64a707822f SHA512 e804a89124f26b66e55715a7bc69d741c76cbd8dd1b08d32e6284d86d76f91626afcbdd8d4f8716cf124a509f5e252c5e584839255db2af12c9c4160d13668f3 WHIRLPOOL 563658505f52ac75ec7d9e1b210a97849d74391beed8e8ecd4110bf43ba01bc86367e826dc0f2a3c0ba7fdca600b24a0d44788040469a7501b7f888221a23567
DIST OpenAL-1.7.0.0.tar.gz 41297 SHA256 5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984 SHA512 2d2a4623e8559c49ae025a695e50115cf9dc31952a4666006913c797b45fcb560e772d939f76999de6273078cf1986feb263fd428e52df3a1db2cdfa80815f17 WHIRLPOOL 075675b545d3f5de5fbd14cb1952dfeaf692c250450150f758043433304d12c1ddedc91eeae4137375a04ebba2029b00371fa6b5dd8b67a248e16dbe6ddb66c7
diff --git a/dev-haskell/openal/openal-1.3.1.1.ebuild b/dev-haskell/openal/openal-1.3.1.1.ebuild
deleted file mode 100644
index caa422b57945..000000000000
--- a/dev-haskell/openal/openal-1.3.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-MY_PN="OpenAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Haskell binding to the OpenAL cross-platform 3D audio API"
-HOMEPAGE="http://haskell.org/ghc/"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=" amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.4
- >=dev-haskell/opengl-2.2.1
- media-libs/openal"
-
-S="${WORKDIR}/${MY_P}"
-
-#TODO: install examples perhaps?
diff --git a/dev-haskell/pango/pango-0.13.1.1.ebuild b/dev-haskell/pango/pango-0.13.1.1.ebuild
index dce9ffa1f912..9b6c20e7caff 100644
--- a/dev-haskell/pango/pango-0.13.1.1.ebuild
+++ b/dev-haskell/pango/pango-0.13.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] =dev-haskell/blaze-builder-0.2.1.4:=[profile?] =dev-haskell/case-insensitive-0.2:=[profile?]
+ dev-haskell/cookie:=[profile?]
+ dev-haskell/data-default-class:=[profile?]
+ >=dev-haskell/fast-logger-2.4.5:=[profile?] =dev-haskell/http-types-0.7:=[profile?]
+ dev-haskell/iproute:=[profile?]
+ >=dev-haskell/lifted-base-0.1.2:=[profile?]
+ >=dev-haskell/network-2.6.1.0:=[profile?]
+ >=dev-haskell/old-locale-1.0.0.2:=[profile?] =dev-haskell/resourcet-0.4.6:=[profile?] =dev-haskell/stringsearch-0.3:=[profile?] =dev-haskell/text-0.7:=[profile?]
+ >=dev-haskell/transformers-0.2.2:=[profile?]
+ dev-haskell/unix-compat:=[profile?]
+ dev-haskell/vault:=[profile?]
+ >=dev-haskell/void-0.5:=[profile?]
+ >=dev-haskell/wai-3.0.3.0:=[profile?] =dev-haskell/wai-logger-2.2.6:=[profile?] =dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+ test? ( >=dev-haskell/hspec-1.3
+ dev-haskell/hunit )
+"
diff --git a/dev-haskell/wai-logger/Manifest b/dev-haskell/wai-logger/Manifest
index 63010ceea03b..aadb7276b2f5 100644
--- a/dev-haskell/wai-logger/Manifest
+++ b/dev-haskell/wai-logger/Manifest
@@ -1,2 +1,2 @@
DIST wai-logger-2.2.4.1.tar.gz 6585 SHA256 f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8 SHA512 0900ecbcebed9433541ae4665c98037f1da832d6e6659be81328433f3ba9a5f258059736205e36517fdc22aefbd2d85e79bb5b50296c257b964c9256b2e828c5 WHIRLPOOL 7d3a5bc6359b4edd5ef899a742bc984d3116d7a56ad3b9583818cacd8ce41da75189ed513cdedfdee0502673d51f57f92b467b1870424b75ec35766485d5da41
-DIST wai-logger-2.2.5.tar.gz 6566 SHA256 678e6fa92d2a8c71182b96e809c69cca4558ddd132ec41bdcf786cf5f1800ba3 SHA512 7300260f4d3f0dda065a7a26c579329dea2d5314ce26e969eb7e62fb0afcbbf3b097b52e703ec1ddb000481a60df0b567ad3f6dab204c5178be6e16cebf522ea WHIRLPOOL 76a9cd9b1204233b73b9dcff9f4dab7d7df43c073d4150761aa821f64de5863f12f9d0dbd003ceacde941e77043fde7c8dbf7bb82bc14c9d7399ea2c9bf9f632
+DIST wai-logger-2.2.7.tar.gz 5162 SHA256 f4718c7661373b6a93fb7ac4b4662617f9e161f6b9297d0f665f71391e489607 SHA512 09335971d30ef615c579df29214c7f9a1e7295c457d3d0aa6107d80a6ffce1399c13a101e7a4b64f0d869f66206fe28f8d0e0b01787421dd59f46046ebee382d WHIRLPOOL cee0c62af76507f832d404e8d9867f894992c9a93eefe4ed60a956156d86de4394499c003663f1d83ec1512b57f6d219653153841bcf029042cda92d36c63283
diff --git a/dev-haskell/wai-logger/wai-logger-2.2.5.ebuild b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
similarity index 72%
rename from dev-haskell/wai-logger/wai-logger-2.2.5.ebuild
rename to dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
index 09c3c211a45f..3ce1ad8cc05e 100644
--- a/dev-haskell/wai-logger/wai-logger-2.2.5.ebuild
+++ b/dev-haskell/wai-logger/wai-logger-2.2.7.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-# ebuild generated by hackport 0.4.6.9999
+# ebuild generated by hackport 0.4.7.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,17 +15,15 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
-RESTRICT=test # wai-test cyclic depend
+RESTRICT=test # missing file?
-RDEPEND="dev-haskell/auto-update:=[profile?]
- dev-haskell/blaze-builder:=[profile?]
+RDEPEND="dev-haskell/blaze-builder:=[profile?]
dev-haskell/byteorder:=[profile?]
dev-haskell/case-insensitive:=[profile?]
- >=dev-haskell/easy-file-0.2:=[profile?]
- >=dev-haskell/fast-logger-2.2:=[profile?]
+ >=dev-haskell/fast-logger-2.4.5:=[profile?]
dev-haskell/http-types:=[profile?]
dev-haskell/network:=[profile?]
>=dev-haskell/unix-time-0.2.2:=[profile?]
diff --git a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
index 80ba2362fdbf..af0ae513c373 100644
--- a/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
+++ b/dev-haskell/wl-pprint-text/wl-pprint-text-1.1.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-haskell/text-0.11.0.0:=[profile?] =dev-haskell/aeson-0.7.0.6:=[profile?]
- >=dev-haskell/ansi-terminal-0.6.1.1:=[profile?]
- >=dev-haskell/ansi-wl-pprint-0.6.7.1:=[profile?]
- >=dev-haskell/asn1-encoding-0.8.1.3:=[profile?]
- >=dev-haskell/asn1-parse-0.8.1:=[profile?]
- >=dev-haskell/asn1-types-0.2.3:=[profile?]
- >=dev-haskell/async-2.0.1.5:=[profile?]
- >=dev-haskell/attoparsec-0.12.0.0:=[profile?]
- >=dev-haskell/attoparsec-conduit-1.1.0:=[profile?]
- >=dev-haskell/authenticate-1.3.2.8:=[profile?]
- >=dev-haskell/base16-bytestring-0.1.1.6:=[profile?]
- >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?]
- >=dev-haskell/blaze-builder-0.3.3.2:=[profile?]
- >=dev-haskell/blaze-builder-conduit-1.1.0:=[profile?]
- >=dev-haskell/blaze-html-0.7.0.2:=[profile?]
- >=dev-haskell/blaze-markup-0.6.1.0:=[profile?]
- >=dev-haskell/byteable-0.1.1:=[profile?]
- >=dev-haskell/byteorder-1.0.4:=[profile?]
- >=dev-haskell/case-insensitive-1.2.0.0:=[profile?]
- >=dev-haskell/cereal-0.4.0.1:=[profile?]
- >=dev-haskell/cipher-aes-0.2.7:=[profile?]
- >=dev-haskell/cipher-des-0.0.6:=[profile?]
- >=dev-haskell/cipher-rc4-0.1.4:=[profile?]
- >=dev-haskell/clientsession-0.9.0.3:=[profile?]
- >=dev-haskell/conduit-1.1.6:=[profile?]
- >=dev-haskell/conduit-extra-1.1.0.4:=[profile?]
- >=dev-haskell/connection-0.2.1:=[profile?]
- >=dev-haskell/cookie-0.4.1.1:=[profile?]
- >=dev-haskell/cprng-aes-0.5.2:=[profile?]
- >=dev-haskell/crypto-api-0.13:=[profile?]
- >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?]
- >=dev-haskell/crypto-numbers-0.2.3:=[profile?]
- >=dev-haskell/crypto-pubkey-0.2.4:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.4.2.2:=[profile?]
- >=dev-haskell/crypto-random-0.0.7:=[profile?]
- >=dev-haskell/cryptohash-0.11.5:=[profile?]
- >=dev-haskell/cryptohash-conduit-0.1.1:=[profile?]
- >=dev-haskell/css-text-0.1.2.1:=[profile?]
- >=dev-haskell/data-default-0.5.3:=[profile?]
- >=dev-haskell/data-default-class-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-base-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?]
- >=dev-haskell/dlist-0.7.0.1:=[profile?]
- >=dev-haskell/email-validate-2.0.1:=[profile?]
- >=dev-haskell/entropy-0.3.2:=[profile?]
- >=dev-haskell/esqueleto-1.4.1.2:=[profile?]
- >=dev-haskell/exceptions-0.6.1:=[profile?]
- >=dev-haskell/fast-logger-2.1.5:=[profile?]
- >=dev-haskell/file-embed-0.0.7:=[profile?]
- >=dev-haskell/hamlet-1.2.0:=[profile?]
- >=dev-haskell/hjsmin-0.1.4.6:=[profile?]
- >=dev-haskell/hspec-1.9.5:=[profile?]
- >=dev-haskell/hspec-expectations-0.5.0.1:=[profile?]
- >=dev-haskell/html-conduit-1.1.0.5:=[profile?]
- >=dev-haskell/http-client-0.3.3:=[profile?]
- >=dev-haskell/http-client-tls-0.2.1.1:=[profile?]
- >=dev-haskell/http-conduit-2.1.2:=[profile?]
- >=dev-haskell/http-date-0.0.4:=[profile?]
- >=dev-haskell/http-reverse-proxy-0.3.1.8:=[profile?]
- >=dev-haskell/http-types-0.8.5:=[profile?]
- >=dev-haskell/language-javascript-0.5.13:=[profile?]
- >=dev-haskell/lifted-base-0.2.2.2:=[profile?]
- >=dev-haskell/mime-mail-0.4.5.2:=[profile?]
- >=dev-haskell/mime-types-0.1.0.4:=[profile?]
- >=dev-haskell/mmorph-1.0.3:=[profile?]
- >=dev-haskell/monad-control-0.3.3.0:=[profile?]
- >=dev-haskell/monad-logger-0.3.6.1:=[profile?]
- >=dev-haskell/monad-loops-0.4.2:=[profile?]
- >=dev-haskell/nats-0.2:=[profile?]
- >=dev-haskell/network-conduit-1.1.0:=[profile?]
- >=dev-haskell/optparse-applicative-0.8.1:=[profile?]
- >=dev-haskell/path-pieces-0.1.3.1:=[profile?]
- >=dev-haskell/pem-0.2.2:=[profile?]
- >=dev-haskell/persistent-1.3.1.1:=[profile?]
- >=dev-haskell/persistent-template-1.3.1.4:=[profile?]
- >=dev-haskell/primitive-0.5.3.0:=[profile?]
- >=dev-haskell/publicsuffixlist-0.1:=[profile?]
- >=dev-haskell/pwstore-fast-2.4.1:=[profile?]
- >=dev-haskell/quickcheck-io-0.1.1:=[profile?]
- >=dev-haskell/resource-pool-0.2.3.0:=[profile?]
- >=dev-haskell/resourcet-1.1.2.2:=[profile?]
- >=dev-haskell/safe-0.3.4:=[profile?]
- >=dev-haskell/scientific-0.3.2.1:=[profile?]
- >=dev-haskell/securemem-0.1.3:=[profile?]
- >=dev-haskell/semigroups-0.15:=[profile?]
- >=dev-haskell/setenv-0.1.1.1:=[profile?]
- >=dev-haskell/sha-1.6.4:=[profile?]
- >=dev-haskell/shakespeare-2.0.0.3:=[profile?]
- >=dev-haskell/shakespeare-css-1.1.0:=[profile?]
- >=dev-haskell/shakespeare-i18n-1.1.0:=[profile?]
- >=dev-haskell/shakespeare-js-1.3.0:=[profile?]
- >=dev-haskell/shakespeare-text-1.1.0:=[profile?]
- >=dev-haskell/silently-1.2.4.1:=[profile?]
- >=dev-haskell/simple-sendfile-0.2.14:=[profile?]
- >=dev-haskell/skein-1.0.9:=[profile?]
- >=dev-haskell/socks-0.5.4:=[profile?]
- >=dev-haskell/stm-chans-3.0.0.2:=[profile?]
- >=dev-haskell/streaming-commons-0.1.3:=[profile?]
- >=dev-haskell/stringsearch-0.3.6.5:=[profile?]
- >=dev-haskell/system-fileio-0.3.14:=[profile?]
- >=dev-haskell/system-filepath-0.4.12:=[profile?]
- >=dev-haskell/tagged-0.7.2:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?]
- >=dev-haskell/tagstream-conduit-0.5.5.1:=[profile?]
- >=dev-haskell/tf-random-0.5:=[profile?]
- >=dev-haskell/tls-1.2.8:=[profile?]
- >=dev-haskell/transformers-base-0.4.2:=[profile?]
- >=dev-haskell/unix-compat-0.4.1.1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.4.0:=[profile?]
- >=dev-haskell/utf8-string-0.3.8:=[profile?]
- >=dev-haskell/vector-0.10.11.0:=[profile?]
- >=dev-haskell/void-0.6.1:=[profile?]
- >=dev-haskell/wai-3.0.0:=[profile?]
- >=dev-haskell/wai-app-static-3.0.0:=[profile?]
- >=dev-haskell/wai-extra-3.0.0:=[profile?]
- >=dev-haskell/wai-logger-2.1.1:=[profile?]
- >=dev-haskell/wai-test-3.0.0:=[profile?]
- >=dev-haskell/warp-3.0.0.2:=[profile?]
- >=dev-haskell/warp-tls-3.0.0:=[profile?]
- >=dev-haskell/word8-0.0.4:=[profile?]
- >=dev-haskell/x509-1.4.11:=[profile?]
- >=dev-haskell/x509-store-1.4.4:=[profile?]
- >=dev-haskell/x509-system-1.4.5:=[profile?]
- >=dev-haskell/x509-validation-1.5.0:=[profile?]
- >=dev-haskell/xml-conduit-1.2.0.2:=[profile?]
- >=dev-haskell/xml-types-0.3.4:=[profile?]
- >=dev-haskell/xss-sanitize-0.3.5.2:=[profile?]
- >=dev-haskell/yaml-0.8.8.3:=[profile?]
- >=dev-haskell/yesod-1.2.6:=[profile?]
- >=dev-haskell/yesod-auth-1.3.1:=[profile?]
- >=dev-haskell/yesod-auth-hashdb-1.3.0.1:=[profile?]
- >=dev-haskell/yesod-core-1.2.16:=[profile?]
- >=dev-haskell/yesod-form-1.3.10:=[profile?]
- >=dev-haskell/yesod-persistent-1.2.3:=[profile?]
- >=dev-haskell/yesod-routes-1.2.0.6:=[profile?]
- >=dev-haskell/yesod-static-1.2.4:=[profile?]
- >=dev-haskell/yesod-test-1.2.3:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
- cabal_chdeps \
- ' == ' ' >= '
-}
diff --git a/dev-haskell/yesod-platform/yesod-platform-1.2.7.2.ebuild b/dev-haskell/yesod-platform/yesod-platform-1.2.7.2.ebuild
deleted file mode 100644
index 2a79d75d36b2..000000000000
--- a/dev-haskell/yesod-platform/yesod-platform-1.2.7.2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Meta package for Yesod"
-HOMEPAGE="http://www.yesodweb.com/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.7.0.1:=[profile?]
- >=dev-haskell/ansi-terminal-0.6.1.1:=[profile?]
- >=dev-haskell/asn1-encoding-0.8.1.2:=[profile?]
- >=dev-haskell/asn1-parse-0.8.1:=[profile?]
- >=dev-haskell/asn1-types-0.2.3:=[profile?]
- >=dev-haskell/attoparsec-0.11.1.0:=[profile?]
- >=dev-haskell/attoparsec-conduit-1.0.1.2:=[profile?]
- >=dev-haskell/authenticate-1.3.2.6:=[profile?]
- >=dev-haskell/base-unicode-symbols-0.2.2.4:=[profile?]
- >=dev-haskell/base64-bytestring-1.0.0.1:=[profile?]
- >=dev-haskell/blaze-builder-0.3.3.2:=[profile?]
- >=dev-haskell/blaze-builder-conduit-1.0.0:=[profile?]
- >=dev-haskell/blaze-html-0.7.0.1:=[profile?]
- >=dev-haskell/blaze-markup-0.6.0.0:=[profile?]
- >=dev-haskell/byteable-0.1.1:=[profile?]
- >=dev-haskell/byteorder-1.0.4:=[profile?]
- >=dev-haskell/case-insensitive-1.1.0.3:=[profile?]
- >=dev-haskell/cereal-0.4.0.1:=[profile?]
- >=dev-haskell/cipher-aes-0.2.6:=[profile?]
- >=dev-haskell/cipher-rc4-0.1.4:=[profile?]
- >=dev-haskell/clientsession-0.9.0.3:=[profile?]
- >=dev-haskell/conduit-1.0.14:=[profile?]
- >=dev-haskell/connection-0.2.0:=[profile?]
- >=dev-haskell/control-monad-loop-0.1:=[profile?]
- >=dev-haskell/cookie-0.4.0.1:=[profile?]
- >=dev-haskell/cprng-aes-0.5.2:=[profile?]
- >=dev-haskell/crypto-api-0.13:=[profile?]
- >=dev-haskell/crypto-cipher-types-0.0.9:=[profile?]
- >=dev-haskell/crypto-conduit-0.5.2.2:=[profile?]
- >=dev-haskell/crypto-numbers-0.2.3:=[profile?]
- >=dev-haskell/crypto-pubkey-0.2.4:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.4.1:=[profile?]
- >=dev-haskell/crypto-random-0.0.7:=[profile?]
- >=dev-haskell/cryptohash-0.11.2:=[profile?]
- >=dev-haskell/cryptohash-cryptoapi-0.1.0:=[profile?]
- >=dev-haskell/css-text-0.1.1:=[profile?]
- >=dev-haskell/data-default-0.5.3:=[profile?]
- >=dev-haskell/data-default-class-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-base-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-containers-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-dlist-0.0.1:=[profile?]
- >=dev-haskell/data-default-instances-old-locale-0.0.1:=[profile?]
- >=dev-haskell/dlist-0.6.0.1:=[profile?]
- >=dev-haskell/email-validate-2.0.1:=[profile?]
- >=dev-haskell/entropy-0.2.2.4:=[profile?]
- >=dev-haskell/esqueleto-1.3.4.5:=[profile?]
- >=dev-haskell/failure-0.2.0.1:=[profile?]
- >=dev-haskell/fast-logger-2.1.5:=[profile?]
- >=dev-haskell/file-embed-0.0.6:=[profile?]
- >=dev-haskell/filesystem-conduit-1.0.0.1:=[profile?]
- >=dev-haskell/hamlet-1.1.7.7:=[profile?]
- >=dev-haskell/hjsmin-0.1.4.5:=[profile?]
- >=dev-haskell/hspec-1.8.3:=[profile?]
- >=dev-haskell/hspec-expectations-0.5.0.1:=[profile?]
- >=dev-haskell/html-conduit-1.1.0.1:=[profile?]
- >=dev-haskell/http-client-0.2.2.2:=[profile?]
- >=dev-haskell/http-client-conduit-0.2.0.1:=[profile?]
- >=dev-haskell/http-client-tls-0.2.1.1:=[profile?]
- >=dev-haskell/http-conduit-2.0.0.5:=[profile?]
- >=dev-haskell/http-date-0.0.4:=[profile?]
- >=dev-haskell/http-types-0.8.3:=[profile?]
- >=dev-haskell/language-javascript-0.5.8:=[profile?]
- >=dev-haskell/lifted-base-0.2.2.0:=[profile?]
- >=dev-haskell/mime-mail-0.4.4:=[profile?]
- >=dev-haskell/mime-types-0.1.0.3:=[profile?]
- >=dev-haskell/mmorph-1.0.2:=[profile?]
- >=dev-haskell/monad-control-0.3.2.3:=[profile?]
- >=dev-haskell/monad-logger-0.3.4.0:=[profile?]
- >=dev-haskell/monad-loops-0.4.2:=[profile?]
- >=dev-haskell/network-conduit-1.0.2.2:=[profile?]
- >=dev-haskell/optparse-applicative-0.7.0.2:=[profile?]
- >=dev-haskell/path-pieces-0.1.3.1:=[profile?]
- >=dev-haskell/pem-0.2.1:=[profile?]
- >=dev-haskell/persistent-1.3.0.2:=[profile?]
- >=dev-haskell/persistent-template-1.3.1.1:=[profile?]
- >=dev-haskell/pool-conduit-0.1.2:=[profile?]
- >=dev-haskell/primitive-0.5.1.0:=[profile?]
- >=dev-haskell/process-conduit-1.0.0.1:=[profile?]
- >=dev-haskell/publicsuffixlist-0.1:=[profile?]
- >=dev-haskell/puremd5-2.1.2.1:=[profile?]
- >=dev-haskell/pwstore-fast-2.4.1:=[profile?]
- >=dev-haskell/quickcheck-io-0.1.0:=[profile?]
- >=dev-haskell/resource-pool-0.2.1.1:=[profile?]
- >=dev-haskell/resourcet-0.4.10:=[profile?]
- >=dev-haskell/safe-0.3.4:=[profile?]
- >=dev-haskell/scientific-0.2.0.1:=[profile?]
- >=dev-haskell/securemem-0.1.3:=[profile?]
- >=dev-haskell/semigroups-0.12.2:=[profile?]
- >=dev-haskell/setenv-0.1.1.1:=[profile?]
- >=dev-haskell/sha-1.6.4:=[profile?]
- >=dev-haskell/shakespeare-1.2.0.4:=[profile?]
- >=dev-haskell/shakespeare-css-1.0.6.6:=[profile?]
- >=dev-haskell/shakespeare-i18n-1.0.0.5:=[profile?]
- >=dev-haskell/shakespeare-js-1.2.0.3:=[profile?]
- >=dev-haskell/shakespeare-text-1.0.1:=[profile?]
- >=dev-haskell/silently-1.2.4.1:=[profile?]
- >=dev-haskell/simple-sendfile-0.2.13:=[profile?]
- >=dev-haskell/skein-1.0.8.1:=[profile?]
- >=dev-haskell/socks-0.5.4:=[profile?]
- >=dev-haskell/stm-chans-3.0.0:=[profile?]
- >=dev-haskell/stringsearch-0.3.6.5:=[profile?]
- >=dev-haskell/system-fileio-0.3.12:=[profile?]
- >=dev-haskell/system-filepath-0.4.9:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?]
- >=dev-haskell/tagsoup-0.13.1:=[profile?]
- >=dev-haskell/tagstream-conduit-0.5.5:=[profile?]
- >=dev-haskell/text-stream-decode-0.1.0.3:=[profile?]
- >=dev-haskell/tls-1.2.2:=[profile?]
- >=dev-haskell/transformers-base-0.4.1:=[profile?]
- >=dev-haskell/unix-compat-0.4.1.1:=[profile?]
- >=dev-haskell/unordered-containers-0.2.3.3:=[profile?]
- >=dev-haskell/utf8-light-0.4.2:=[profile?]
- >=dev-haskell/utf8-string-0.3.7:=[profile?]
- >=dev-haskell/vector-0.10.9.1:=[profile?]
- >=dev-haskell/void-0.6.1:=[profile?]
- >=dev-haskell/wai-2.0.0:=[profile?]
- >=dev-haskell/wai-app-static-2.0.0.2:=[profile?]
- >=dev-haskell/wai-extra-2.0.3.3:=[profile?]
- >=dev-haskell/wai-logger-2.1.1:=[profile?]
- >=dev-haskell/wai-test-2.0.0.1:=[profile?]
- >=dev-haskell/warp-2.0.3.3:=[profile?]
- >=dev-haskell/warp-tls-2.0.2:=[profile?]
- >=dev-haskell/word8-0.0.4:=[profile?]
- >=dev-haskell/x509-1.4.7:=[profile?]
- >=dev-haskell/x509-store-1.4.4:=[profile?]
- >=dev-haskell/x509-system-1.4.2:=[profile?]
- >=dev-haskell/x509-validation-1.5.0:=[profile?]
- >=dev-haskell/xml-conduit-1.1.0.9:=[profile?]
- >=dev-haskell/xml-types-0.3.4:=[profile?]
- >=dev-haskell/xss-sanitize-0.3.4.2:=[profile?]
- >=dev-haskell/yaml-0.8.7.2:=[profile?]
- >=dev-haskell/yesod-1.2.5:=[profile?]
- >=dev-haskell/yesod-auth-1.2.5.3:=[profile?]
- >=dev-haskell/yesod-core-1.2.6.7:=[profile?]
- >=dev-haskell/yesod-form-1.3.5.1:=[profile?]
- >=dev-haskell/yesod-persistent-1.2.2.1:=[profile?]
- >=dev-haskell/yesod-routes-1.2.0.6:=[profile?]
- >=dev-haskell/yesod-static-1.2.2.1:=[profile?]
- >=dev-haskell/yesod-test-1.2.1:=[profile?]
- >=dev-haskell/zlib-bindings-0.1.1.3:=[profile?]
- >=dev-haskell/zlib-conduit-1.0.0:=[profile?]
- >=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0.3
-"
-
-src_prepare() {
- cabal_chdeps \
- ' == ' ' >= '
-}
diff --git a/dev-haskell/zlib/zlib-0.5.4.2.ebuild b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
index 7a191e84e4e1..f37112854fb2 100644
--- a/dev-haskell/zlib/zlib-0.5.4.2.ebuild
+++ b/dev-haskell/zlib/zlib-0.5.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=dev-lang/ghc-7.4.1:=
diff --git a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
index 9cdb30f0e312..67e58adaf190 100644
--- a/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
+++ b/dev-java/piccolo2d/piccolo2d-3.0-r1.ebuild
@@ -41,10 +41,10 @@ src_install() {
dodoc Readme.txt ReleaseNotes.txt
if use examples; then
- local INSDESTTREE=/usr/share/doc/${PF}/examples
- doins -r examples/src/main/java/org/piccolo2d/examples/*
- doins -r examples/src/main/java/org/piccolo2d/tutorial
- doins -r swt-examples/src/main/java/org/piccolo2d/extras
- docompress -x "${INSDESTTREE}"
+ docinto examples
+ dodoc -r examples/src/main/java/org/piccolo2d/examples/*
+ dodoc -r examples/src/main/java/org/piccolo2d/tutorial
+ dodoc -r swt-examples/src/main/java/org/piccolo2d/extras
+ docompress -x /usr/share/doc/${PF}/examples
fi
}
diff --git a/dev-lang/clojure/clojure-1.8.0.ebuild b/dev-lang/clojure/clojure-1.8.0.ebuild
index 348aa950ca8a..4e3a65e13ff2 100644
--- a/dev-lang/clojure/clojure-1.8.0.ebuild
+++ b/dev-lang/clojure/clojure-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/clojure/clojure/tarball/${P} -> ${P}.tar.gz"
LICENSE="EPL-1.0 Apache-2.0 BSD"
SLOT="1.8"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 ~x86 ~x86-linux"
IUSE=""
RESTRICT="test" # patches welcome to fix the test
diff --git a/dev-lang/erlang/erlang-18.0-r2.ebuild b/dev-lang/erlang/erlang-18.0-r2.ebuild
index 96ff59c06b2c..5b2f7ca31346 100644
--- a/dev-lang/erlang/erlang-18.0-r2.ebuild
+++ b/dev-lang/erlang/erlang-18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
http://erlang.org/download/otp_doc_man_${PV}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-LICENSE="ErlPL-1.1"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-18.2.1.ebuild b/dev-lang/erlang/erlang-18.2.1.ebuild
index 6d34a36af583..115cb2e7c51e 100644
--- a/dev-lang/erlang/erlang-18.2.1.ebuild
+++ b/dev-lang/erlang/erlang-18.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
http://erlang.org/download/otp_doc_man_${PV}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-LICENSE="ErlPL-1.1"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
index 1a1af848ed38..27c7037585f7 100644
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ b/dev-lang/erlang/erlang-18.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
http://erlang.org/download/otp_doc_man_${PV}.tar.gz
doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-LICENSE="ErlPL-1.1"
+LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index 19a40462ffb2..9721ed4fb10f 100644
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@@ -73,7 +73,7 @@ BUMP_LIBRARIES=(
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc ghcbootstrap ghcmakebinary +gmp"
IUSE+=" binary"
IUSE+=" elibc_glibc" # system stuff
diff --git a/dev-lang/nasm/nasm-2.12.01.ebuild b/dev-lang/nasm/nasm-2.12.01.ebuild
index e69def9404df..df9d219f1da0 100644
--- a/dev-lang/nasm/nasm-2.12.01.ebuild
+++ b/dev-lang/nasm/nasm-2.12.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.nasm.us/pub/nasm/releasebuilds/${PV/_}/${P/_}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
DEPEND="dev-lang/perl
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index b82fd8c83806..8477b89a0346 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -7,3 +7,5 @@ DIST perl-5.22.1-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fab
DIST perl-5.22.1.tar.bz2 13696599 SHA256 e98e4075a3167fa40524abe447c30bcca10c60e02a54ee1361eff278947a1221 SHA512 4da26b1d3d8525c58677abd2c5c354ccaa4b1b260ebe7dfe379d51a5da00ac7ae06cb668011faac2aaf56229fd22b275c13a74c8c9dbc59cc155a36c0e7e8355 WHIRLPOOL 03d8a050421f1f1899ad8b195d61d0cc55ce061b39ab4dab41b0fbb079a4871d76e968943b83e8165f2f4d1fa42bc87e1c6780aeae1ccc22a720115dfddf17cb
DIST perl-5.22.2-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fabb6dcd779c7458a05a73aae51ecc1508 SHA512 2a0a74c935273ae3eafaebc6ed20c730a49f542433d899d51baaa3c3e7a291974fcef734d6320895811b4a6944c4e36b2a01400ed751a11c5d3edd6491bbf41b WHIRLPOOL 58888d5c3d35a217e9f61ee9f1406ea5383d192b0875dc736f124613056f71837d84346431127be3c56ae780394aa86cd18d9fad9740e7970e704beb5d2bf112
DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058 SHA512 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a WHIRLPOOL bdfd1035728619abafeb679cdd3181269a91fad5c30f4995e91d5ae16cb65210ce2c4c47afe85eb192ebde88c0bbc4cd0ed77939acdfd09760b11b57eeace2a6
+DIST perl-5.24.0-patches-1.tar.xz 17320 SHA256 7be09434e7d73f47be3d1d9f6e6f72f5e705a7b5cfbef07ee9b8b53b2a08ef14 SHA512 430c06d6298cbd5eb8b7db9947ca288fcd747e19652285278ac2a84c90cdf756463505c50e7bd97fbd98bb45119dc898d94c4fb7af50bb57d9c2b959cba0d944 WHIRLPOOL b1f3cf64af35cb9364563ede25d700ff6b0ebaa93f978b7d65a2085498cce0d20d527e00e0a2b17a3d7dc9ef81d85e68985ec0ec00560e9696a8eb3ee61f0383
+DIST perl-5.24.0.tar.bz2 14155784 SHA256 62328a53d157e8153b33e137594155f6f8b64418f7f9238210feb809585290e0 SHA512 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 WHIRLPOOL 84c98ddb19a5c6d32f40b427ba1f82656f88cfe5b7d3f416fb92579436890af52299f05301a81692dfdae65594b1866081e1fee067623256d796855d87d532ad
diff --git a/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit b/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit
new file mode 100644
index 000000000000..2603ef459280
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+eblit-perl-pkg_postinst() {
+ dual_scripts
+
+ if [[ "${ROOT}" = "/" ]] ; then
+ local INC DIR file
+ INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+ einfo "Removing old .ph files"
+ for DIR in ${INC} ; do
+ if [[ -d "${DIR}" ]] ; then
+ for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+ rm -f "${file}"
+ einfo "<< ${file}"
+ done
+ fi
+ done
+ # Silently remove the now empty dirs
+ for DIR in ${INC} ; do
+ if [[ -d "${DIR}" ]] ; then
+ find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+ fi
+ done
+
+# einfo "Converting C header files to the corresponding Perl format (ignore any error)"
+# # Prefix note: unprefixed as this is all kernel/libc stuff that we never provide
+# pushd /usr/include >/dev/null
+# h2ph -Q -a -d "${EPREFIX}"${ARCH_LIB} \
+# asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
+# sys/socket.h sys/time.h wait.h sysexits.h
+# popd >/dev/null
+
+ fi
+}
diff --git a/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit b/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit
new file mode 100644
index 000000000000..ed98a8697e51
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+eblit-perl-pkg_postrm(){
+ dual_scripts
+}
diff --git a/dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit b/dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit
new file mode 100644
index 000000000000..9ce8e992c326
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+eblit-perl-pkg_setup() {
+ case ${CHOST} in
+ *-freebsd*) osname="freebsd" ;;
+ *-dragonfly*) osname="dragonfly" ;;
+ *-netbsd*) osname="netbsd" ;;
+ *-openbsd*) osname="openbsd" ;;
+ *-darwin*) osname="darwin" ;;
+ *-interix*) osname="interix" ;;
+ *-aix*) osname="aix" ;;
+ *) osname="linux" ;;
+ esac
+
+ myarch="${CHOST%%-*}-${osname}"
+ if use debug ; then
+ myarch+="-debug"
+ fi
+ if use ithreads ; then
+ mythreading="-multi"
+ myarch+="-thread"
+ fi
+
+ LIBPERL="libperl$(get_libname ${MY_PV} )"
+ PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
+ ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+ SITE_LIB="/usr/local/$(get_libdir)/perl5/${MY_PV}"
+ SITE_ARCH="/usr/local/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
+ VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
+ VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
+
+ if use ithreads ; then
+ echo ""
+ ewarn "THREADS WARNING"
+ ewarn "PLEASE NOTE: You are compiling ${MY_P} with interpreter-level threading enabled."
+ ewarn "Threading is not supported by all applications that compile against perl. You"
+ ewarn "use threading at your own discretion."
+ fi
+ check_rebuild
+ dual_scripts
+}
+
+check_rebuild() {
+ if has_version " "${S}"/patchlevel-gentoo.h
+}
+
+eblit-perl-src_prepare() {
+ local patch
+ EPATCH_OPTS+=" -p1"
+ einfo "Applying patches from ${MY_P}-${PATCH_VER} ..."
+ while read patch ; do
+ EPATCH_SINGLE_MSG=" ${patch} ..."
+ epatch "${WORKDIR}"/patches/${patch}
+ done < "${WORKDIR}"/patches/series
+
+ src_prepare_update_patchlevel_h
+
+ # pod/perltoc.pod fails
+ # lib/ExtUtils/t/Embed.t fails
+ if ! tc-is-static-only ; then
+ ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+ ln -s ${LIBPERL} libperl$(get_libname ) || die
+ fi
+
+ default
+}
+
diff --git a/dev-lang/perl/perl-5.24.0.ebuild b/dev-lang/perl/perl-5.24.0.ebuild
new file mode 100644
index 000000000000..61cb52f3be64
--- /dev/null
+++ b/dev-lang/perl/perl-5.24.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+
+PERL_OLDVERSEN=""
+MODULE_AUTHOR=RJBS
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+ mirror://cpan/src/5.0/${MY_P}.tar.bz2
+ mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2
+ mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz
+ https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
+"
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SHORT_PV}"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="berkdb debug doc gdbm ithreads"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:* )
+ gdbm? ( >=sys-libs/gdbm-1.8.3 )
+ app-arch/bzip2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ !prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+"
+PDEPEND="
+ >=app-admin/perl-cleaner-2.5
+ >=virtual/perl-File-Temp-0.230.400-r2
+ >=virtual/perl-Data-Dumper-2.154.0
+ virtual/perl-Test-Harness
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+ src_remove_dual perl-core/Archive-Tar 2.40.0 ptar ptardiff ptargrep
+ src_remove_dual perl-core/Digest-SHA 5.950.0 shasum
+ src_remove_dual perl-core/CPAN 2.110.0 cpan
+ src_remove_dual perl-core/Encode 2.800.0 enc2xs piconv
+ src_remove_dual perl-core/ExtUtils-MakeMaker 7.100.100_rc instmodsh
+ src_remove_dual perl-core/ExtUtils-ParseXS 3.310.0 xsubpp
+ src_remove_dual perl-core/IO-Compress 2.69.0 zipdetails
+ src_remove_dual perl-core/JSON-PP 2.273.0 json_pp
+ src_remove_dual perl-core/Module-CoreList 5.201.605.60 corelist
+ src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect
+ src_remove_dual perl-core/Pod-Perldoc 3.250.200_rc perldoc
+ src_remove_dual perl-core/Test-Harness 3.360.0 prove
+ src_remove_dual perl-core/podlators 4.70.0 pod2man pod2text
+ src_remove_dual_man perl-core/podlators 4.70.0 /usr/share/man/man1/perlpodstyle.1
+}
+
+# eblit-include [--skip] [version]
+eblit-include() {
+ local skipable=false
+ [[ $1 == "--skip" ]] && skipable=true && shift
+ [[ $1 == pkg_* ]] && skipable=true
+
+ local e v func=$1 ver=$2
+ [[ -z ${func} ]] && die "Usage: eblit-include [version]"
+ for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+ e="${FILESDIR}/eblits/${func}${v}.eblit"
+ if [[ -e ${e} ]] ; then
+ . "${e}"
+ return 0
+ fi
+ done
+ ${skipable} && return 0
+ die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe
+# run the specified function if it is defined
+eblit-run-maybe() {
+ [[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+ eblit-include --skip common "${*:2}"
+ eblit-include "$@"
+ eblit-run-maybe eblit-$1-pre
+ eblit-${PN}-$1
+ eblit-run-maybe eblit-$1-post
+}
+
+src_prepare() { eblit-run src_prepare v50240001 ; }
+
+src_configure() { eblit-run src_configure v50180002 ; }
+
+#src_compile() { eblit-run src_compile v50160001 ; }
+
+src_test() {
+ export NO_GENTOO_NETWORK_TESTS=1;
+ eblit-run src_test v50160001 ;
+}
+
+src_install() { eblit-run src_install v50200001 ; }
+
+# FILESDIR might not be available during binpkg install
+# FIXME: version passing
+for x in setup {pre,post}{inst,rm} ; do
+ e="${FILESDIR}/eblits/pkg_${x}-v50240001.eblit"
+ if [[ -e ${e} ]] ; then
+ . "${e}"
+ eval "pkg_${x}() { eblit-run pkg_${x} v50240001 ; }"
+ fi
+done
diff --git a/dev-lang/php/php-5.5.35.ebuild b/dev-lang/php/php-5.5.35.ebuild
index 7368d9b939c8..d65f01022341 100644
--- a/dev-lang/php/php-5.5.35.ebuild
+++ b/dev-lang/php/php-5.5.35.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.6.21.ebuild b/dev-lang/php/php-5.6.21.ebuild
index bde480b30d61..2dbaf77b6e42 100644
--- a/dev-lang/php/php-5.6.21.ebuild
+++ b/dev-lang/php/php-5.6.21.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/python-exec/metadata.xml b/dev-lang/python-exec/metadata.xml
index 36f1f9e8f814..edb96f5bbbf4 100644
--- a/dev-lang/python-exec/metadata.xml
+++ b/dev-lang/python-exec/metadata.xml
@@ -10,7 +10,7 @@
mgorny@gentoo.org
Michał Górny
- https://bitbucket.org/mgorny/python-exec/issues/
+ https://github.com/mgorny/python-exec/issues/
mgorny/python-exec
diff --git a/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild b/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
index 1e8fd442af1d..9f61668c91b9 100644
--- a/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
+++ b/dev-lang/python-exec/python-exec-2.0.1-r1.ebuild
@@ -11,8 +11,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit autotools-utils python-r1
DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
diff --git a/dev-lang/python-exec/python-exec-2.0.2.ebuild b/dev-lang/python-exec/python-exec-2.0.2.ebuild
index 6c17713614c6..ed19eba42e1a 100644
--- a/dev-lang/python-exec/python-exec-2.0.2.ebuild
+++ b/dev-lang/python-exec/python-exec-2.0.2.ebuild
@@ -11,8 +11,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit autotools-utils python-r1
DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
diff --git a/dev-lang/python-exec/python-exec-2.1.ebuild b/dev-lang/python-exec/python-exec-2.1.ebuild
index dbcb2ed726a8..4b4d2ac2712c 100644
--- a/dev-lang/python-exec/python-exec-2.1.ebuild
+++ b/dev-lang/python-exec/python-exec-2.1.ebuild
@@ -13,8 +13,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit python-r1
DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
diff --git a/dev-lang/python-exec/python-exec-2.4.3.ebuild b/dev-lang/python-exec/python-exec-2.4.3.ebuild
index 93ca528d489e..1db43aaa1120 100644
--- a/dev-lang/python-exec/python-exec-2.4.3.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.3.ebuild
@@ -13,8 +13,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit python-r1
DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-9999.ebuild
index 574412546bdd..c130a90f5411 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=5
#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
inherit autotools git-r3
#endif
@@ -19,8 +19,8 @@ PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
inherit python-r1
DESCRIPTION="Python script wrapper"
-HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
diff --git a/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild b/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
index 8a88947ef674..a28428ee7c1f 100644
--- a/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
+++ b/dev-libs/UTF8Strings/UTF8Strings-1.14.2.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="http://grigory.info/${PN}.About.html"
SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
diff --git a/dev-libs/glib/glib-2.46.2-r3.ebuild b/dev-libs/glib/glib-2.46.2-r3.ebuild
index 2165c076ad55..e4b64599c150 100644
--- a/dev-libs/glib/glib-2.46.2-r3.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r3.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
!=dev-libs/libwacom-0.12 )
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+# test? (
+# >=dev-libs/check-0.9.10
+# dev-util/valgrind
+# sys-libs/libunwind )
+
+src_prepare() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ # building documentation silently fails with graphviz syntax errors
+ econf \
+ --disable-documentation \
+ --disable-event-gui \
+ $(use_enable input_devices_wacom libwacom) \
+ $(use_enable test tests) \
+ --with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/libuv/libuv-1.8.0.ebuild b/dev-libs/libuv/libuv-1.8.0.ebuild
index 82c495009d39..1e1d611ee58b 100644
--- a/dev-libs/libuv/libuv-1.8.0.ebuild
+++ b/dev-libs/libuv/libuv-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild b/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
index f05c9b03d702..b4dc2ca8dcd3 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+qt4 qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-libs/sway/sway-0.6.ebuild b/dev-libs/sway/sway-0.6.ebuild
index e87b63f666fd..7cdb67cc4434 100644
--- a/dev-libs/sway/sway-0.6.ebuild
+++ b/dev-libs/sway/sway-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/SirCmpwn/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="swaylock swaybg swaybar swaygrab swaymsg gdk-pixbuf zsh-completion wallpapers systemd"
+IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd"
RDEPEND="dev-libs/wlc[systemd=]
dev-libs/json-c
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 4a2b39bf0291..dc3bafc41a1b 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/SirCmpwn/sway.git"
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
-IUSE="swaylock swaybg swaybar swaygrab swaymsg gdk-pixbuf zsh-completion wallpapers systemd"
+IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd"
RDEPEND="=dev-libs/wlc-9999[systemd=]
dev-libs/json-c
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 508983e87f7e..71ef15eae6cc 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,4 @@
DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256 3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512 ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30 WHIRLPOOL 33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256 b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512 0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0 WHIRLPOOL 05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2acebffff10bc558a83305a637ce
DIST xapian-bindings-1.2.23.tar.xz 885888 SHA256 19b4b56c74863c51733d8c2567272ef7f004b898cf44016711ae25bc524b2215 SHA512 4be9d103a4073a08d2481e9ddc347156d4028a1517f313861ad3664e6103e052dc1a0d07a992da3ca02599505c002d09d77c4fd886c144918aab72977e69994c WHIRLPOOL 1323e51dcd8f18f573f9338d9a013bfd370870c1fd2c0b0e3ff9d1f6b3b9154a0512d7442d7c7b1b00a70757faa218e8894a0f4fe56da88bca12ba2259cd35de
-DIST xapian-bindings-1.3.5.tar.xz 1005824 SHA256 4b5b9089d39b2a725651349127f64d24fe66db46572bdd92f39b8483bca400c3 SHA512 57c903a48c4e0875f5ada5b311afe74b0c0a2136d9827fd136638b4fb0f30ed51afaff57fb664ab264ac7eee4b3f61f4dc391f03bc17f63cc06de57eaaef5cc2 WHIRLPOOL 12e70382f584609de1bc00b3527f9b755ccdfa201203da9595c62fde622fd5b85f66c3f3bf314c7f2e1a9f313557fd11899dff5eced3823247b8fa2b6691890b
DIST xapian-bindings-1.3.6.tar.xz 1019216 SHA256 ba33436dee5165f61f2e289cfb18b1acdc4b2a811afdf68158845680e744eda0 SHA512 318324d9deb6a359de79eadb792c598661bde2ff9e1b241e29b18cdf1a2cf3dbeb9f5643c6bf8c7fbdbc8a2fd0baa91384398e694448312b6d8383960407f7fe WHIRLPOOL eb6844809572cad97d90be20ee27d28556342b27145e9e6c1efaea09f50a6001bad708a6370051edb9d065081a571c7552aaa36c601e1247a9aa5c5550549131
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
deleted file mode 100644
index 2bd895b5deaa..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.5-fix-perl-doc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- perl/Makefile.am.orig 2016-04-14 19:05:30.879298356 -0400
-+++ perl/Makefile.am 2016-04-14 19:05:37.907298474 -0400
-@@ -168,10 +168,10 @@
- endif
- MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-
-+if DOCUMENTATION_RULES
- docdatadir = $(docdir)/perl
- docdata_DATA = docs/index.html
-
--if DOCUMENTATION_RULES
- BUILT_SOURCES += docs/index.html
-
- docs/index.html: Xapian.pm
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch
new file mode 100644
index 000000000000..7851bfe405bb
--- /dev/null
+++ b/dev-libs/xapian-bindings/files/xapian-bindings-1.3.6-allow-ruby-2.0.patch
@@ -0,0 +1,12 @@
+diff -Naur xapian-bindings-1.3.6.orig/configure xapian-bindings-1.3.6/configure
+--- xapian-bindings-1.3.6.orig/configure 2016-05-09 06:19:59.000000000 -0400
++++ xapian-bindings-1.3.6/configure 2016-05-14 13:53:35.223526344 -0400
+@@ -18695,7 +18695,7 @@
+ fi
+ RUBY=
+ ;;
+- [01].*|2.0.*)
++ [01].*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version (too old)" >&5
+ $as_echo "$version (too old)" >&6; }
+ if test yes = "$with_ruby" ; then
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
deleted file mode 100644
index 1e2c71d5f539..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=threads
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-DISTUTILS_IN_SOURCE_BUILD=yesplz
-
-USE_PHP="php5-5 php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-inherit autotools distutils-r1 libtool java-pkg-opt-2 php-ext-source-r2 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-IUSE="java lua perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.3.6
- lua? ( dev-lang/lua:= )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- ruby? ( dev-lang/ruby:= )
- tcl? ( dev-lang/tcl:= )"
-# mono? ( dev-lang/mono )
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-# use mono && mono-env_pkg_setup
- use java && java-pkg-opt-2_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use java && java-pkg-opt-2_src_prepare
-
- # http://trac.xapian.org/ticket/702
- export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
- # Fix bug #579412 - requires re-automaking
- epatch "${FILESDIR}"/${P}-fix-perl-doc.patch
- eautoreconf
-}
-
-src_configure() {
- if use java; then
- export CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
- fi
-
- if use perl; then
- export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
- export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
- fi
-
- if use lua; then
- export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
- fi
-
- econf \
- --disable-documentation \
- $(use_with java) \
- $(use_with lua) \
- --without-csharp \
- $(use_with perl) \
- $(use_with php) \
- $(use_with python) \
- $(use_with ruby) \
- $(use_with tcl)
-# $(use_with mono csharp)
-}
-
-src_compile() {
- local -x PYTHONDONTWRITEBYTECODE=
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if use java; then
- java-pkg_dojar java/built/xapian_jni.jar
- # TODO: make the build system not install this...
- java-pkg_doso java/.libs/libxapian_jni.so
- rm -rf "${D}var" || die "could not remove java cruft!"
- fi
-
- use php && php-ext-source-r2_createinifiles
-
- # For some USE combinations this directory is not created
- if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
- mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
- fi
-
- dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
index c9d87b043311..e71fefefe1f8 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.6.ebuild
@@ -61,6 +61,9 @@ src_prepare() {
# http://trac.xapian.org/ticket/702
export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+ # Accept ruby 2.0 - patch configure directly to avoid autoreconf
+ epatch "${FILESDIR}"/${P}-allow-ruby-2.0.patch
}
src_configure() {
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 6298eeca625f..217bc0869a7d 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,5 +1,4 @@
DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb
DIST xapian-core-1.2.22.tar.xz 3204096 SHA256 269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f SHA512 cb6bd565eb307f9bc8f801fc9cda0cc6ad5d7cb8bf0af2ab6e42d48ca4ea4169f08621db810ab87d15957d0f873bcb0336e16b12fdb6026375d9c0192781e0d6 WHIRLPOOL 580c16889a6c3e99a00f8bb791f878a08ff3522c3dffb18ace18d54575247332f0fff8866f46475513dde7544205fe08971cbd284ec3714ce0d6b9b445e8746e
DIST xapian-core-1.2.23.tar.xz 3206452 SHA256 9783aeae4e1a6d06e5636b270db4b458a7d0804a31da158269f57fa5dc86347d SHA512 df3fa71150575faf982d6b90f2364962d61012dd45ed7ef4945a0623ed7056c32ea3cbc423f2016415a80779251ecb5080b6a34c5b66b823cf8d92fe6b5b3d30 WHIRLPOOL a5498117b060218455946948c119e52ed0639a2c2d5f1fd60e416ab06ad2cd483814039801d1fa29e097a994927d482a2bd10ab18bca28a413198ea1adb4187b
-DIST xapian-core-1.3.5.tar.xz 2580788 SHA256 3ad99ff4e91a4ff997fd576377e7c8f0134ceb3695c49e8f7d78ebf3c19b70ad SHA512 9617ad41546c6e8107d0ce1d4ec010930627174004d22372badef96279d2c0da35d70e04225f901d88f256083ca1c880b79fa3cde1e00176fa6b07f01d47a237 WHIRLPOOL 8c39ecc2e0890fb96ec28ee947134fad0d9f164dec479323481d66502798eef90cf2818c9948f14f83070fd3cafe44924682e8dd6848b83494a45b4528739e12
DIST xapian-core-1.3.6.tar.xz 2605652 SHA256 e952795a6619366e1de7d2bebf0e636c34123170fd41316878e28d693819da82 SHA512 a4a4c800d6b4708ba7793da7e413d91777ab30076526022ca12f2c497ab9b68dbf17b08abd4282c32f66778a4c7ad00cce37925fea36384960874a0327637ac1 WHIRLPOOL 2c6858f1b6dece7aacf2397beab3312681750c18559125771ef00a1768d2ae26eadcdc7aaac24f5121aeb634a36984e95b635965509f0e494d8c0d06971155d7
diff --git a/dev-libs/xapian/xapian-1.3.5.ebuild b/dev-libs/xapian/xapian-1.3.5.ebuild
deleted file mode 100644
index 45570fae6014..000000000000
--- a/dev-libs/xapian/xapian-1.3.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1.3.6" # ABI version of libxapian-1.3.so, prefixed with 1.3.
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local myconf=""
-
- ewarn
- if use cpu_flags_x86_sse2; then
- ewarn "Using sse2"
- myconf="${myconf} --enable-sse=sse2"
- else
- if use cpu_flags_x86_sse; then
- ewarn "Using sse"
- myconf="${myconf} --enable-sse=sse"
- else
- ewarn "Disabling sse and sse2"
- myconf="${myconf} --disable-sse"
- fi
- fi
- ewarn
-
- myconf="${myconf} $(use_enable static-libs static)"
-
- use brass || myconf="${myconf} --disable-backend-brass"
- use chert || myconf="${myconf} --disable-backend-chert"
- use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
- myconf="${myconf} --enable-backend-remote --program-suffix="
-
- econf $myconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # bug #573466
- ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
- mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die
- use doc || rm -rf "${D}usr/share/doc/${PF}"
-
- dodoc AUTHORS HACKING PLATFORMS README NEWS
-
- prune_libtool_files --all
-}
-
-src_test() {
- emake check VALGRIND=
-}
diff --git a/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild b/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
index 596d3bcba5f1..f5c1648f1fca 100644
--- a/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
+++ b/dev-perl/Const-Fast/Const-Fast-0.14.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Event-RPC/Event-RPC-1.50.0.ebuild b/dev-perl/Event-RPC/Event-RPC-1.50.0.ebuild
index 6896848619b3..70ab123d96cd 100644
--- a/dev-perl/Event-RPC/Event-RPC-1.50.0.ebuild
+++ b/dev-perl/Event-RPC/Event-RPC-1.50.0.ebuild
@@ -20,4 +20,6 @@ RDEPEND="|| ( dev-perl/Event dev-perl/glib-perl )
virtual/perl-Storable"
DEPEND="${RDEPEND}"
-SRC_TEST="do"
+SRC_TEST=skip
+# tests hang, at least on 5.24... probably trying to do something network-related
+# needs more investigation
diff --git a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
index 500609d74073..fb3328769922 100644
--- a/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
+++ b/dev-perl/FileHandle-Unget/FileHandle-Unget-0.162.800.ebuild
@@ -19,6 +19,7 @@ RDEPEND=">=virtual/perl-Scalar-List-Utils-1.140.0"
DEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.360.0
dev-perl/File-Slurp
+ dev-perl/URI
test? ( virtual/perl-Test-Simple )
"
diff --git a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.5.ebuild b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.5.ebuild
index e06afe2505e1..443e05121639 100644
--- a/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.5.ebuild
+++ b/dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.3.5.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Use Cpanel::JSON::XS with a fallback to JSON::XS and JSON::PP"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
# needs Scalar-Util
diff --git a/dev-perl/PAR/PAR-1.10.0.ebuild b/dev-perl/PAR/PAR-1.10.0.ebuild
index 40153acca0f4..5f0883685a64 100644
--- a/dev-perl/PAR/PAR-1.10.0.ebuild
+++ b/dev-perl/PAR/PAR-1.10.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl Archive Toolkit"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-solaris"
IUSE="minimal"
DEPEND="
diff --git a/dev-perl/PDF-API2/PDF-API2-2.27.0.ebuild b/dev-perl/PDF-API2/PDF-API2-2.27.0.ebuild
index 7556cf2fbb8c..13f5a6ca7138 100644
--- a/dev-perl/PDF-API2/PDF-API2-2.27.0.ebuild
+++ b/dev-perl/PDF-API2/PDF-API2-2.27.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Facilitates the creation and modification of PDF files"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="examples"
RDEPEND="
diff --git a/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild b/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild
index d12878012ee3..4a7d6d8c50fc 100644
--- a/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild
+++ b/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Create PDF documents in Perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86"
IUSE="test examples"
RDEPEND="
diff --git a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild
index 81acbe95a2af..bebc5a8249e8 100644
--- a/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild
+++ b/dev-perl/POE-Test-Loops/POE-Test-Loops-1.360.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Reusable tests for POE::Loop authors"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/POE/POE-1.367.ebuild b/dev-perl/POE/POE-1.367.ebuild
index 6e8c97caab04..c0bd07363a83 100644
--- a/dev-perl/POE/POE-1.367.ebuild
+++ b/dev-perl/POE/POE-1.367.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="A framework for creating multitasking programs in Perl"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="ipv6 libwww ncurses tk test"
RDEPEND="
diff --git a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.48.0.ebuild b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.48.0.ebuild
index a78b9476e24f..dee301837dd0 100644
--- a/dev-perl/PPIx-Regexp/PPIx-Regexp-0.48.0.ebuild
+++ b/dev-perl/PPIx-Regexp/PPIx-Regexp-0.48.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Represent a regular expression of some sort"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
IUSE="test examples"
RDEPEND="
diff --git a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
index 776145d21829..1b66271f8064 100644
--- a/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
+++ b/dev-perl/Package-DeprecationManager/Package-DeprecationManager-0.150.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Manage deprecation warnings for your distribution"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
index 602de9186573..f0a2304b5278 100644
--- a/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
+++ b/dev-perl/Package-Stash/Package-Stash-0.370.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Routines for manipulating stashes"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test minimal"
RDEPEND="
diff --git a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
index 5c90a99f870a..7116b7bc5f10 100644
--- a/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.200.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="play with other peoples' lexical variables"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Pango/Pango-1.227.0.ebuild b/dev-perl/Pango/Pango-1.227.0.ebuild
index 5bc5648e0e8d..592dcdcc0e1b 100644
--- a/dev-perl/Pango/Pango-1.227.0.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Layout and render international text"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test minimal"
RDEPEND="
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.170.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.170.0.ebuild
index 81e95ca03a96..563b7507ebdf 100644
--- a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.170.0.ebuild
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.170.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A simple parallel processing fork manager"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~sparc-solaris ~x86-solaris"
IUSE="test minimal examples"
RDEPEND="
diff --git a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
index b0f371649963..08d277993f14 100644
--- a/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
+++ b/dev-perl/Params-Validate/Params-Validate-1.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Flexible system for validation of method/function call parameters"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.13.ebuild b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.13.ebuild
index 85acda0cd4ee..b6b0c6ae7c6c 100644
--- a/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.13.ebuild
+++ b/dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.13.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Generate Recursive-Descent Parsers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test examples"
RDEPEND="
diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
index 044982c785be..d923382553a5 100644
--- a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
+++ b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Critique Perl source code for best-practices"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
RDEPEND=">=dev-perl/Module-Pluggable-3.1
diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild
index abbd5b42bb9f..e772c3465ec5 100644
--- a/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild
+++ b/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="test minimal"
PATCHES=(
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild
index 1149c66c4d11..c48282b1e4f6 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="examples"
RDEPEND=""
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
index 671a2f047892..cad04da1a8b6 100644
--- a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Querying your filehandle's capabilities"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# needs List::Util
diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
index 0556d587a47e..f567ea66514e 100644
--- a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
+++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="PerlIO layer to gzip/gunzip"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND="sys-libs/zlib"
diff --git a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild b/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
index f406b14b3043..10ffab63be41 100644
--- a/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
+++ b/dev-perl/Plucene/Plucene-1.250.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Plucene - the Perl lucene port"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
RDEPEND="virtual/perl-Memoize
diff --git a/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild b/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
index 18f362d12796..5ef5f6f56e9a 100644
--- a/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
+++ b/dev-perl/PostScript-Simple/PostScript-Simple-0.90.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Allows you to have a simple method of writing PostScript files from
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE="test examples"
RDEPEND=""
diff --git a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
index e4481cbfec24..3dfb0735aa3f 100644
--- a/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
+++ b/dev-perl/Probe-Perl/Probe-Perl-0.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Information about the currently running perl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
IUSE="test"
RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild b/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild
index 8b8971c4ee00..0a042bd5057a 100644
--- a/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild
+++ b/dev-perl/Proc-Daemon/Proc-Daemon-0.230.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Run Perl program as a daemon process"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="minimal"
RDEPEND="!minimal? ( dev-perl/Proc-ProcessTable )"
diff --git a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
index b3ba54a0cb1c..a8acfadc49c6 100644
--- a/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
+++ b/dev-perl/Proc-ProcessTable/Proc-ProcessTable-0.530.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Unix process table information"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="examples"
PATCHES=(
diff --git a/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild b/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild
index 9c7c65b83a51..2b2628d1182c 100644
--- a/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild
+++ b/dev-perl/Proc-Simple/Proc-Simple-1.320.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Launch and control background processes"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="test examples"
RDEPEND="virtual/perl-IO"
diff --git a/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild b/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
index c81b991755f8..14a7bafdd3ed 100644
--- a/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
+++ b/dev-perl/RPC-XML/RPC-XML-0.790.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="An implementation of XML-RPC"
SLOT="0"
LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
IUSE="test"
SRC_TEST="do"
diff --git a/dev-perl/Readonly/Readonly-2.0.0.ebuild b/dev-perl/Readonly/Readonly-2.0.0.ebuild
index 3fc3b52b459a..7d776b00cc82 100644
--- a/dev-perl/Readonly/Readonly-2.0.0.ebuild
+++ b/dev-perl/Readonly/Readonly-2.0.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, hashes"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="test"
DEPEND="
diff --git a/dev-perl/Roman/Roman-1.240.0.ebuild b/dev-perl/Roman/Roman-1.240.0.ebuild
index 3a5e0daca80e..f23be70fcc14 100644
--- a/dev-perl/Roman/Roman-1.240.0.ebuild
+++ b/dev-perl/Roman/Roman-1.240.0.ebuild
@@ -13,7 +13,7 @@ inherit perl-module
DESCRIPTION="Perl module for conversion between Roman and Arabic numerals"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="test? (
diff --git a/dev-perl/SGMLSpm/SGMLSpm-1.1.ebuild b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
similarity index 82%
rename from dev-perl/SGMLSpm/SGMLSpm-1.1.ebuild
rename to dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
index ad5731703cf3..a0c8c03b8616 100644
--- a/dev-perl/SGMLSpm/SGMLSpm-1.1.ebuild
+++ b/dev-perl/SGMLSpm/SGMLSpm-1.1-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=6
DIST_AUTHOR=RAAB
-inherit eutils perl-module
+inherit perl-module
DESCRIPTION="Perl library for parsing the output of nsgmls"
LICENSE="GPL-2+"
@@ -14,3 +14,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
IUSE=""
DEPEND="dev-perl/Module-Build"
+
+src_install() {
+ perl-module_src_install
+ dosym sgmlspl.pl /usr/bin/sgmlspl
+}
diff --git a/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild b/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
index c862b12ff635..ea5e971dca15 100644
--- a/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
+++ b/dev-perl/SQL-Abstract/SQL-Abstract-1.810.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Generate SQL from Perl data structures"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/SVG/SVG-2.640.0.ebuild b/dev-perl/SVG/SVG-2.640.0.ebuild
index ee908103a686..57ee76ddae7a 100644
--- a/dev-perl/SVG/SVG-2.640.0.ebuild
+++ b/dev-perl/SVG/SVG-2.640.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl extension for generating Scalable Vector Graphics (SVG) documents"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
index ebdf53dc4b9f..968c0e203735 100644
--- a/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
+++ b/dev-perl/Scope-Guard/Scope-Guard-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Lexically scoped resource management"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
index b0defbd81b1a..9d2894bc957e 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.23.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="examples"
RDEPEND="dev-libs/xapian:0/1.2.22
diff --git a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild b/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
index 9ca6e5aff947..1939c240d19f 100644
--- a/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
+++ b/dev-perl/Set-Object/Set-Object-1.350.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="set of objects and strings"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild b/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
index c17a19aafa4d..d32b2d7f2ef2 100644
--- a/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
+++ b/dev-perl/Set-Scalar/Set-Scalar-1.290.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Scalar set operations"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
index c5159ac71e4a..78967ffde8ef 100644
--- a/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
+++ b/dev-perl/Shell-EnvImporter/Shell-EnvImporter-1.70.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Import environment variable changes from external commands or shell scripts"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=dev-perl/Class-MethodMaker-2"
diff --git a/dev-perl/Shell/Shell-0.730.0.ebuild b/dev-perl/Shell/Shell-0.730.0.ebuild
index a51a1fb37d40..5549cd823983 100644
--- a/dev-perl/Shell/Shell-0.730.0.ebuild
+++ b/dev-perl/Shell/Shell-0.730.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Run shell commands transparently within perl"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-perl/Socket6/Socket6-0.270.0.ebuild b/dev-perl/Socket6/Socket6-0.270.0.ebuild
index c179c0d7ec5c..0dcff0a8b720 100644
--- a/dev-perl/Socket6/Socket6-0.270.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.270.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild b/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
index ea8b3f4e8395..33629a1abbbf 100644
--- a/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
+++ b/dev-perl/Sort-Versions/Sort-Versions-1.620.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A perl 5 module for sorting of revision-like numbers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Spiffy/Spiffy-0.460.0.ebuild b/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
index eed1ab383a39..453a60c33d2e 100644
--- a/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
+++ b/dev-perl/Spiffy/Spiffy-0.460.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Spiffy Perl Interface Framework For You"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.300.0"
diff --git a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
index 95924af3d93b..6bc08670aa33 100644
--- a/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
+++ b/dev-perl/Spreadsheet-ParseExcel/Spreadsheet-ParseExcel-0.650.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Read information from an Excel file"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test cjk unicode"
# Digest::Perl::MD5 cannot be replaced by Digest::MD5, as this module actually
diff --git a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
index 17709c9dbf29..4f1c8020de49 100644
--- a/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
+++ b/dev-perl/Statistics-Descriptive/Statistics-Descriptive-3.61.200.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Module of basic descriptive statistical functions"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="test examples"
RDEPEND="
diff --git a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
index 42d2382402f5..120d003eba0b 100644
--- a/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
+++ b/dev-perl/String-CRC32/String-CRC32-1.500.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for cyclic redundancy check generation"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
SRC_TEST=do
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
index a8c84676bd09..f8ac09c49887 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.120.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Retrieve names of code references"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
index 640c6bcc2d53..7f8d6762fe34 100644
--- a/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
+++ b/dev-perl/Sub-Install/Sub-Install-0.928.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Install subroutines into packages easily"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.250.0.ebuild b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.250.0.ebuild
index 0d20daf6df6a..caf8f156f81d 100644
--- a/dev-perl/Sub-Uplevel/Sub-Uplevel-0.250.0.ebuild
+++ b/dev-perl/Sub-Uplevel/Sub-Uplevel-0.250.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Apparently run a function in a higher stack frame"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Switch/Switch-2.170.0.ebuild b/dev-perl/Switch/Switch-2.170.0.ebuild
index ff910749bc94..e394cbe2c067 100644
--- a/dev-perl/Switch/Switch-2.170.0.ebuild
+++ b/dev-perl/Switch/Switch-2.170.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A switch statement for Perl"
#SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/perl-core/Switch/Switch-2.16-rt60380.patch"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-linux ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0.ebuild b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0.ebuild
index 350ce571361f..9b4e2e4be66f 100644
--- a/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0.ebuild
+++ b/dev-perl/Sys-Hostname-Long/Sys-Hostname-Long-1.500.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Try every conceivable way to get full hostname"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
src_install() {
diff --git a/dev-perl/Test-Without-Module/Test-Without-Module-0.180.0.ebuild b/dev-perl/Test-Without-Module/Test-Without-Module-0.180.0.ebuild
index a0f773bbcc92..762e5b0f9f12 100644
--- a/dev-perl/Test-Without-Module/Test-Without-Module-0.180.0.ebuild
+++ b/dev-perl/Test-Without-Module/Test-Without-Module-0.180.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Test fallback behaviour in absence of modules"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
DEPEND="
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
index 0a049823f611..07373eb89a29 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.1.ebuild
@@ -10,7 +10,7 @@ USE_PHP="php5-5 php5-6 php7-0"
inherit php-ext-pecl-r2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DESCRIPTION="PHP wrapper for the ImageMagick library"
LICENSE="PHP-3.01"
diff --git a/dev-python/glance_store/glance_store-0.9.2.ebuild b/dev-python/glance_store/glance_store-0.9.2.ebuild
index a9c32eac3d02..69b52c6d6e6c 100644
--- a/dev-python/glance_store/glance_store-0.9.2.ebuild
+++ b/dev-python/glance_store/glance_store-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="+cinder +swift"
CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/pbr-1.9.1.ebuild b/dev-python/pbr/pbr-1.9.1.ebuild
index 64ff796cf12b..c90c0df11209 100644
--- a/dev-python/pbr/pbr-1.9.1.ebuild
+++ b/dev-python/pbr/pbr-1.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
index d53d5e6c4767..2c7fc9b06036 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="WTFPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~x86"
+KEYWORDS="amd64 arm ~x86"
IUSE="test"
RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
index 423a63ae0f2b..d4fd88fd9caf 100644
--- a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -66,8 +66,7 @@ src_install () {
dodoc RELEASE-1.0 SUCCESS doc/python-taylor.txt
if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r doc/examples/.
- docompress -x "${INSDESTTREE}"
+ dodoc -r doc/examples
+ docompress -x /usr/share/doc/${PF}/examples
fi
}
diff --git a/dev-python/pycups/pycups-1.9.73.ebuild b/dev-python/pycups/pycups-1.9.73.ebuild
index ea8a00118095..b5b12dd83e93 100644
--- a/dev-python/pycups/pycups-1.9.73.ebuild
+++ b/dev-python/pycups/pycups-1.9.73.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pygal/pygal-2.1.1.ebuild b/dev-python/pygal/pygal-2.1.1.ebuild
index 16730f0383c6..f51b00d4b137 100644
--- a/dev-python/pygal/pygal-2.1.1.ebuild
+++ b/dev-python/pygal/pygal-2.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-bin/pypy-bin-4.0.1-r1.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.1-r1.ebuild
index 3c67610d60f1..6863329c26c5 100644
--- a/dev-python/pypy-bin/pypy-bin-4.0.1-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-4.0.1-r1.ebuild
@@ -115,7 +115,7 @@ src_compile() {
use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
- pax-mark m pypy-c
+ pax-mark m pypy-c libpypy-c.so
# ctypes config cache
# this one we need to do with python2 too...
@@ -131,27 +131,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -159,8 +160,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -191,16 +192,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy-bin/pypy-bin-5.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.0.0.ebuild
index 3d5c40a078d6..0850563fb49a 100644
--- a/dev-python/pypy-bin/pypy-bin-5.0.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.0.0.ebuild
@@ -115,7 +115,7 @@ src_compile() {
use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
- pax-mark m pypy-c
+ pax-mark m pypy-c libpypy-c.so
# ctypes config cache
# this one we need to do with python2 too...
@@ -131,27 +131,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -159,8 +160,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -191,16 +192,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy/pypy-4.0.1.ebuild b/dev-python/pypy/pypy-4.0.1.ebuild
index 9a64dcbae0d0..a6c918a540f0 100644
--- a/dev-python/pypy/pypy-4.0.1.ebuild
+++ b/dev-python/pypy/pypy-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -165,7 +165,7 @@ src_compile() {
"${@}" || die "compile error"
use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ pax-mark m pypy-c libpypy-c.so
}
src_test() {
@@ -176,27 +176,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -204,8 +205,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -237,16 +238,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy/pypy-5.0.0.ebuild b/dev-python/pypy/pypy-5.0.0.ebuild
index 9a64dcbae0d0..a6c918a540f0 100644
--- a/dev-python/pypy/pypy-5.0.0.ebuild
+++ b/dev-python/pypy/pypy-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -165,7 +165,7 @@ src_compile() {
"${@}" || die "compile error"
use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ pax-mark m pypy-c libpypy-c.so
}
src_test() {
@@ -176,27 +176,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -204,8 +205,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -237,16 +238,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 331ea557e59e..07df84769194 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -171,7 +171,7 @@ src_compile() {
"${@}" || die "compile error"
use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ pax-mark m pypy-c libpypy-c.so
}
src_test() {
@@ -182,27 +182,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -210,8 +211,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
@@ -243,16 +244,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
index 9c78d0f0de43..eecd2805cbb9 100644
--- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild
@@ -110,7 +110,7 @@ src_compile() {
#use doc && emake -C pypy/doc/ html
#needed even without jit :( also needed in both compile and install phases
- pax-mark m pypy-c
+ pax-mark m pypy-c libpypy-c.so
# ctypes config cache
# this one we need to do with python2 too...
@@ -128,27 +128,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy3
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy3"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -156,8 +157,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -185,9 +186,9 @@ src_install() {
fi
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
index 07646dbe336f..1cc2f079a45a 100644
--- a/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -162,7 +162,7 @@ src_compile() {
# assert txt.check()
# AssertionError
#use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ pax-mark m pypy-c libpypy-c.so
}
src_test() {
@@ -175,27 +175,28 @@ src_test() {
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy3
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy3"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -203,8 +204,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -234,9 +235,9 @@ src_install() {
fi
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 5f1b62c15d96..8eb168a515c8 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -160,31 +160,32 @@ src_compile() {
"${@}" || die "compile error"
#use doc && emake -C pypy/doc/ html
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+ pax-mark m pypy-c libpypy-c.so
}
src_install() {
+ local dest=/usr/$(get_libdir)/pypy3
einfo "Installing PyPy ..."
- insinto "/usr/$(get_libdir)/pypy3"
+ insinto "${dest}"
doins -r include lib_pypy lib-python pypy-c libpypy-c.so
- fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
- pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
dodoc README.rst
if ! use gdbm; then
- rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
fi
if ! use sqlite; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+ "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
fi
if ! use tk; then
- rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
- "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
- "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+ rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+ "${ED%/}${dest}"/lib_pypy/_tkinter \
+ "${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
fi
# Install docs
@@ -192,8 +193,8 @@ src_install() {
einfo "Generating caches and byte-compiling ..."
- local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
- local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+ local -x PYTHON=${ED%/}${dest}/pypy-c
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}"
# we can't use eclass function since PyPy is dumb and always gives
# paths relative to the interpreter
local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
@@ -225,16 +226,16 @@ src_install() {
local t
# all modules except tkinter output to .
# tkinter outputs to the correct dir ...
- cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+ cd "${ED%/}${dest}"/lib_pypy || die
for t in "${cffi_targets[@]}"; do
# tkinter doesn't work via -m
"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
done
# Cleanup temporary objects
- find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
- find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die
+ find "${ED%/}${dest}" -type d -empty -delete || die
# compile the installed modules
- python_optimize "${ED%/}${INSDESTTREE}"
+ python_optimize "${ED%/}${dest}"
}
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
index cefe78c96a00..97afe6611a0d 100644
--- a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
REQUIRED_USE="test? ( doc )"
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index 96843b5a34b1..2941ec8a22a1 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/alastair/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}$
LICENSE="BSD-2 ISC"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples test"
S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
new file mode 100644
index 000000000000..de435ba8f015
--- /dev/null
+++ b/dev-python/rfc3987/Manifest
@@ -0,0 +1 @@
+DIST rfc3987-1.3.5.tar.gz 8509 SHA256 ed37b839553370971a1d5cd53392206206c56ea550d435ef45e6d94e7df50697 SHA512 66d74daa1653e9dfa0d8968229baa865935a8bf633504171ba9b208fddc936402184bce20828cbe90fec787a941faad0224675cd1db555cf614bfe83dca6b3f7 WHIRLPOOL 4a2b93e0c0437c835be38814ed1d8672530e19dc099bd0f0a340ba87ca55d2632239eb63cfc72586538ec813f37e79d13cae740a3a812110152833a9197b0db5
diff --git a/dev-python/rfc3987/metadata.xml b/dev-python/rfc3987/metadata.xml
new file mode 100644
index 000000000000..1f3c7f977ac9
--- /dev/null
+++ b/dev-python/rfc3987/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ aballier@gentoo.org
+ Alexis Ballier
+ Python team can take the package if they wish.
+
+
+ python@gentoo.org
+ Python
+
+
+ rfc3987
+
+
diff --git a/dev-python/rfc3987/rfc3987-1.3.5.ebuild b/dev-python/rfc3987/rfc3987-1.3.5.ebuild
new file mode 100644
index 000000000000..75bdda89b090
--- /dev/null
+++ b/dev-python/rfc3987/rfc3987-1.3.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)"
+HOMEPAGE="https://github.com/dgerber/rfc3987 http://pypi.python.org/pypi/rfc3987"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ ${EPYTHON} -m doctest -v "${S}/${PN}.py" || die
+}
diff --git a/dev-python/tinycss/tinycss-0.3.ebuild b/dev-python/tinycss/tinycss-0.3.ebuild
index 49ed50947825..5921bfb4254e 100644
--- a/dev-python/tinycss/tinycss-0.3.ebuild
+++ b/dev-python/tinycss/tinycss-0.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
diff --git a/dev-python/uranium/uranium-2.1.0_beta-r1.ebuild b/dev-python/uranium/uranium-2.1.0_beta-r2.ebuild
similarity index 95%
rename from dev-python/uranium/uranium-2.1.0_beta-r1.ebuild
rename to dev-python/uranium/uranium-2.1.0_beta-r2.ebuild
index 4a0e83b4bfe8..50c5a48c0f2a 100644
--- a/dev-python/uranium/uranium-2.1.0_beta-r1.ebuild
+++ b/dev-python/uranium/uranium-2.1.0_beta-r2.ebuild
@@ -21,7 +21,7 @@ IUSE="doc test"
RDEPEND="${PYTHON_DEPS}
dev-libs/libarcus:*[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
dev-python/numpy[${PYTHON_USEDEP}]
dev-qt/qtdeclarative:5
dev-qt/qtquickcontrols:5"
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
new file mode 100644
index 000000000000..32b7369d294a
--- /dev/null
+++ b/dev-python/uvloop/Manifest
@@ -0,0 +1 @@
+DIST uvloop-0.4.20.tar.gz 1781445 SHA256 b39afbc242eafff7471337468b28c4164f55d130f8194e0fb4a8b2eb71cb1298 SHA512 c7f540da9d29340fb0cc0e589143fabc12d4c185d4e7eff889e3434478f445e98c703fd9024af66b6b121bce3c860be2b4da497a6492a43df5891e86b6007d7e WHIRLPOOL 1d50e45cf92fca4b983222038e6524359e7160d0ac87b89265dd298d0fa9f33527c5a839752e6cc0a2d34c6eb27f0919474085616885c779b876a8638a0c5ba1
diff --git a/dev-python/uvloop/metadata.xml b/dev-python/uvloop/metadata.xml
new file mode 100644
index 000000000000..d7bbdfbdabf2
--- /dev/null
+++ b/dev-python/uvloop/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ elvis@magic.io
+ Elvis Pranskevichus
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+ uvloop is a fast, drop-in replacement of the built-in asyncio event loop. uvloop is implemented in Cython and uses libuv under the hood.
+
+ uvloop
+ MagicStack/uvloop
+
+
diff --git a/dev-python/uvloop/uvloop-0.4.20.ebuild b/dev-python/uvloop/uvloop-0.4.20.ebuild
new file mode 100644
index 000000000000..6a2276141556
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.4.20.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv."
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples test"
+
+CDEPEND=">=dev-libs/libuv-1.8.0:="
+DEPEND="
+ ${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.23.4[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+ cat <> setup.cfg
+[build_ext]
+use-system-libuv=1
+EOF
+ distutils-r1_src_prepare
+}
+
+python_compile_all() {
+ use doc && emake docs
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ if use examples; then
+ insinto "/usr/share/doc/${PF}"
+ docompress -x "/usr/share/doc/${PF}/examples"
+ doins -r examples
+ fi
+
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/xcffib/xcffib-0.4.0.ebuild b/dev-python/xcffib/xcffib-0.4.0.ebuild
index 1d0f111fde60..cc367b8c899c 100644
--- a/dev-python/xcffib/xcffib-0.4.0.ebuild
+++ b/dev-python/xcffib/xcffib-0.4.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/tych0/xcffib"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
COMMON_DEPEND="x11-libs/libxcb"
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
new file mode 100644
index 000000000000..c0f6bbbd28a8
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=(
+ "git://code.qt.io/${PN}/${PN}.git"
+ "https://code.qt.io/git/${PN}/${PN}.git"
+ )
+else
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-opensource-src-${MY_PV}
+ [[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+ SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+# allow disabling modeleditor plugin
+# it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+ clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
+ ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
+
+REQUIRED_USE="?? ( webengine webkit )"
+
+# minimum Qt version required
+QT_PV="5.5.0:5"
+
+RDEPEND="
+ =dev-libs/botan-1.10*[-bindist,threads]
+ >=dev-qt/designer-${QT_PV}
+ >=dev-qt/qtconcurrent-${QT_PV}
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtdeclarative-${QT_PV}[widgets]
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qthelp-${QT_PV}
+ >=dev-qt/qtnetwork-${QT_PV}[ssl]
+ >=dev-qt/qtprintsupport-${QT_PV}
+ >=dev-qt/qtquickcontrols-${QT_PV}
+ >=dev-qt/qtscript-${QT_PV}
+ >=dev-qt/qtsql-${QT_PV}[sqlite]
+ >=dev-qt/qtsvg-${QT_PV}
+ >=dev-qt/qtwidgets-${QT_PV}
+ >=dev-qt/qtx11extras-${QT_PV}
+ >=dev-qt/qtxml-${QT_PV}
+ >=sys-devel/gdb-7.5[client,python]
+ clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
+ qbs? ( >=dev-util/qbs-1.5.0 )
+ systemd? ( sys-apps/systemd:= )
+ webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
+ webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
+ virtual/pkgconfig
+ doc? ( >=dev-qt/qdoc-${QT_PV} )
+ test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+ # qt translations must be installed for qt-creator translations to work
+ RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+ autotools? ( sys-devel/autoconf )
+ bazaar? ( dev-vcs/bzr )
+ clangstaticanalyzer? ( sys-devel/clang )
+ cmake? ( dev-util/cmake )
+ cvs? ( dev-vcs/cvs )
+ git? ( dev-vcs/git )
+ mercurial? ( dev-vcs/mercurial )
+ subversion? ( dev-vcs/subversion )
+ valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+ if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+ eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+ die "GCC >= 4.7 required"
+ fi
+
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ # disable unwanted plugins
+ for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+ if ! use ${plugin%:*}; then
+ einfo "Disabling ${plugin%:*} plugin"
+ sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+ fi
+ done
+
+ # automagic dep on qtwebkit (bug 538236)
+ if ! use webkit; then
+ sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable webkit"
+ fi
+
+ # automagic dep on qtwebengine
+ if ! use webengine; then
+ sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+ src/plugins/help/help.pro || die "failed to disable webengine"
+ fi
+
+ # disable broken or unreliable tests
+ sed -i -e '/SUBDIRS/ s/\//' tests/auto/debugger/debugger.pro || die
+ sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+ sed -i -e '/SUBDIRS/ s/\//' tests/auto/valgrind/valgrind.pro || die
+
+ # fix translations
+ sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+ share/qtcreator/translations/translations.pro || die
+
+ # remove bundled qbs
+ rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+ eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+ IDE_PACKAGE_MODE=1 \
+ $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+ CONFIG+=qbs_disable_rpath \
+ CONFIG+=qbs_enable_project_file_updates \
+ $(use systemd && echo CONFIG+=journald) \
+ $(use test && echo BUILD_TESTS=1) \
+ USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+ cd tests/auto && virtx default
+}
+
+src_install() {
+ emake INSTALL_ROOT="${ED}usr" install
+
+ dodoc dist/{changes-*,known-issues}
+
+ # install documentation
+ if use doc; then
+ emake docs
+ # don't use ${PF} or the doc will not be found
+ insinto /usr/share/doc/qtcreator
+ doins share/doc/qtcreator/qtcreator{,-dev}.qch
+ docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+ fi
+
+ # install desktop file
+ make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index 89eaa3c4b6d7..f534d20a3ca2 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1 +1,2 @@
DIST barby-0.6.3.tar.gz 92841 SHA256 51546e7f58fc4587ec7977ac924874ac89ee1397ddd11d3fdeaa3a567dcebb92 SHA512 b7415298ee2d8bb17a88b5c647d707a15151d2110834e87c2d598def88290ad90947bc49ded175b44050d8d95510602d374699fd91f2fb873728e8536dc70ef6 WHIRLPOOL e0272be0adeb828d7745ddbb9ffe61674314943bfd3ad5aaca29a998b38bdd9dbe25d1e4333b182c63edd0240c509a32037c4e9277cdbf0b01723aa261e19a6a
+DIST barby-0.6.4.tar.gz 92848 SHA256 af9bc2d134c5889820ee0fdf87041552f56d0e2bdbf518b5af08240a2f1dd065 SHA512 2cf8c03b73c372578297dbee8de9b814a3fabc9eeed4359e4e93ff3bcfa747825cbff110770eeaa57a6a1a2b1dee88a4e5e38dd5dc141b1a221c5cd533ff6fe2 WHIRLPOOL 9ec2b3a829ce373d52ba15a6863b0e225b9b2a3d2f41b75461ad5f6c93dd6b93c727914a07f997e027ed07ebf1a0f01aebf322847234ace692a0de8a93cbcfef
diff --git a/dev-ruby/barby/barby-0.6.4.ebuild b/dev-ruby/barby/barby-0.6.4.ebuild
new file mode 100644
index 000000000000..83dfd7f38c06
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toretore.eu/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+ rmagick? ( dev-ruby/rmagick )
+ cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+ png? ( dev-ruby/chunky_png )
+ prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+ sed -i -e 's/README/README.md/' Rakefile || die
+
+ sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
+
+ if use qrcode; then
+ sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+ else
+ rm \
+ lib/barby/barcode/qr_code.rb \
+ test/qr_code_test.rb
+ fi
+
+ if use rmagick; then
+ sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+ else
+ rm \
+ lib/barby/outputter/rmagick_outputter.rb \
+ test/outputter/rmagick_outputter_test.rb
+ fi
+
+ if use prawn; then
+ sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+ else
+ rm \
+ lib/barby/outputter/prawn_outputter.rb \
+ test/outputter/prawn_outputter_test.rb
+ fi
+
+ if use png; then
+ sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+ else
+ rm \
+ lib/barby/outputter/png_outputter.rb \
+ test/outputter/png_outputter_test.rb
+ fi
+
+ if use cairo; then
+ sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+ else
+ rm \
+ lib/barby/outputter/cairo_outputter.rb \
+ test/outputter/cairo_outputter_test.rb
+ fi
+
+ rm -f \
+ lib/barby/barcode/data_matrix.rb \
+ test/data_matrix_test.rb \
+ lib/barby/outputter/pdfwriter_outputter.rb \
+ test/outputter/pdfwriter_outputter_test.rb || die
+
+ sed -i \
+ -e '/semacode/d' \
+ -e '/pdf-writer/d' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index 3f8a452058cd..359feca87df3 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
index c8a90690f744..e6d01ea8fb93 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/httpclient/httpclient-2.7.1.ebuild b/dev-ruby/httpclient/httpclient-2.7.1.ebuild
index 25cf2f3ace0d..7aa52b2bfd85 100644
--- a/dev-ruby/httpclient/httpclient-2.7.1.ebuild
+++ b/dev-ruby/httpclient/httpclient-2.7.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/nahi/httpclient/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND}
diff --git a/dev-ruby/metaclass/metaclass-0.0.4.ebuild b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
index 6ab519696f8b..af0cb3fe4e04 100644
--- a/dev-ruby/metaclass/metaclass-0.0.4.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/floehopper/metaclass"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/mustache/mustache-1.0.3.ebuild b/dev-ruby/mustache/mustache-1.0.3.ebuild
index 1cc806de0b45..0fa7a796524b 100644
--- a/dev-ruby/mustache/mustache-1.0.3.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/prawn-table/prawn-table-0.2.2.ebuild b/dev-ruby/prawn-table/prawn-table-0.2.2.ebuild
index 7c48108fd8d8..c63e1e504fdc 100644
--- a/dev-ruby/prawn-table/prawn-table-0.2.2.ebuild
+++ b/dev-ruby/prawn-table/prawn-table-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="yard"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild b/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild
index ffcef7403d88..3d8d65c5fade 100644
--- a/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild
+++ b/dev-ruby/rack-mount/rack-mount-0.8.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
@@ -20,7 +20,7 @@ SLOT="$(get_version_component_range 1-2)"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0"
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
RUBY_PATCHES=( ${PN}-fix-ruby20.patch )
diff --git a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild b/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
index e2810d0534f9..bed25e1433b7 100644
--- a/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.1.8.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
index bf039ba2f02c..3223326777aa 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/rtomayko/rdiscount"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 37a09b1f7447..869a28f6cc7b 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1,2 @@
-DIST spring-1.6.2.tar.gz 39206 SHA256 2e4a579b8847de39fd4ff72d9644c354115d1174809d7f6c9cf67fba774671fe SHA512 bb46cb6fcbb70b976230a32075072f1fa5a7a1d9f4819a8d9783c3793713407e7481e091400fcf9f5cce0e1b40982b76c378f7384425d2ac71c12baec2fd9adf WHIRLPOOL 85bc50cbf156ed7356b603b31e880fbeb35c4062ddd16ed92d83af96444d370d9318bd770f6714daaf8690592c267929ac8ab12f2d3981156da78661c7b148e6
-DIST spring-1.6.3.tar.gz 39349 SHA256 6396158ef4479e5bedaa4383db197ead1e04c4c9781eed3300e954ec66a6ce34 SHA512 88d605cd5c9751a8dd3d9e7903beda0304f0d7b31934735c841b63ee450d5250b73b73f7c95f8a25dcffbbeb73e05028873bf54827481d19a691d345744d576d WHIRLPOOL ff8220c6ba1201765268120434903796c7a2ce3401ca88a71d3b82aaca1694471fe1fe929832559a8faf666aee8b9b517f462aee12a81940d5047893b1dbf719
DIST spring-1.6.4.tar.gz 39370 SHA256 d7584ecb01fb980451c12d65bbb0175c7b15fb3bf8c117058145de5ecc8c349b SHA512 9dffdcef750bd25028761da8e69c44ae3eace843dff9f81d5566085d3a8c7f944f4c99b6d455078ff564b7135116ae38dcf1aaf6dcc127ac351eae85e15dc143 WHIRLPOOL b7fd0e1520b77e1dc150f270e1cb222915ab98322b9ec0f75242fbfeceec7bd6155262a2fdeee8cf8c5651e9b03e1ce441159042c877675ddc3c4e07fbb2e1cb
+DIST spring-1.7.1.tar.gz 41162 SHA256 36f422666a20cd9ae930993f14056e9072e350a24025a26cc5ec59c76725ec33 SHA512 bf561ae5c9bb5e9f6af640c42bedd0e4992713b90c42e984491d77002c729ffa51723b7f691d14443531243150e37f8bfb67cca1f06aefd4c76548f66728103f WHIRLPOOL f934c5484d27a1d54eaf305d604f006d7ef2797b6209de1e6e4802e6ebdddc85f59c6891b5bafde4878d0c8d99f6d5b94738f987320976f7cf49a23769d24924
diff --git a/dev-ruby/spring/spring-1.6.3.ebuild b/dev-ruby/spring/spring-1.6.3.ebuild
deleted file mode 100644
index 034b7e72e60a..000000000000
--- a/dev-ruby/spring/spring-1.6.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
- sed -i -e '/files/d' \
- -e '/bump/d' ${PN}.gemspec || die
- sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/spring/spring-1.6.2.ebuild b/dev-ruby/spring/spring-1.7.1.ebuild
similarity index 100%
rename from dev-ruby/spring/spring-1.6.2.ebuild
rename to dev-ruby/spring/spring-1.7.1.ebuild
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 8988d923d8dc..1b3b10a68824 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,4 +1,5 @@
DIST tins-0.13.1.gem 35328 SHA256 c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30 SHA512 257ba33ec3802355ed74dcbb29aebe05879c541aa032bb2df268ae645f6630cbb7b3f121911389ad78aaf26a5e5f34e87a53033505c0dded78dbd6d8b27982d6 WHIRLPOOL e901e3b6720ab39670ec6fd1f519d2d93eefe1247f72589ff31d8a00796a1b3bd20a23979a50156e3541bd35b287e648ac516d686eec1e57ffc852e112085046
+DIST tins-1.10.1.gem 301056 SHA256 16c2b411d50f923d8e1af4190151db9bd960eb79c48d4d33b331c7880a03afd0 SHA512 1d4ab33d71a575de944da509524ea04a915af0645d42b3b0b07a3116f8181b65d86b5b7391aaa48a5cf388477fc31ccc84d22fa700ec47f9381f7a636e5fe68a WHIRLPOOL 602db6c04b3401acdf752ef1cfc6ea7a16f0d44348ce6e3844c406e277f09f266f4ffb53a55f4b337041194f362ea319fe51efa543297d2bbcbd2d76614a0c3e
DIST tins-1.6.0.gem 299008 SHA256 1f82e41851f343147e8acda8b02a67e990e38d4755e1e7a8de7cd913fcce0a0b SHA512 33d576a0960d841f72a3f3c9017f873d0445fd569ded852d614b4a2b32e59ae784a47246b584bc4e0d16d5be4d63c1d7834b32c2bea2129a75dde9b1723ccd01 WHIRLPOOL 257e019636565081197c3d353396db2937043886696bb6be294b0930a6e1f7ada1a21fd863d1ac29b649bba3875d7d4b868ded70480a0dec0ba27a6764debac1
DIST tins-1.8.2.gem 300032 SHA256 f3964e4bf0c9b795834c76faa90918e8848806bedfd9a954c73f742874a11156 SHA512 9ade583904002473ebc0a193be5733f60be0192594e419e7123f9653841b44738936c794bc78ace024fb4fde3117a3446cc29461f0b5e2bb8c0e38416adbf7d1 WHIRLPOOL a9679ae660cee4e4622005fe6dc305592bce3fd81b06573cda7d5ca74e9ef56a71b20ed7f80a33fe23d7d9e124361171d00bf3aa83dd151df431108a288e7791
DIST tins-1.9.0.gem 301056 SHA256 2d17beff65a34ef74ca1a6721428a6436cf0473b6d701fa68289d3cd2c450deb SHA512 6ef081d492030dc42a548e849699f0b8650d50644dc2c0aacf9b9a1694ff02c1da19bca8926d42d042537c2ea672b1e49dcd88a3fc41d9daf675029db1bc06b2 WHIRLPOOL 33925783766a8814afb6b966d92e63f7202147c9974f72db29af8c7d1df8a1341330a72c407e90dc3251fe96e804dffe103ec62c2edd8eca31f656aaf3adc938
diff --git a/dev-ruby/tins/tins-1.10.1.ebuild b/dev-ruby/tins/tins-1.10.1.ebuild
new file mode 100644
index 000000000000..a668f15d42ac
--- /dev/null
+++ b/dev-ruby/tins/tins-1.10.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+ ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
index 6062035452e8..d7a46f3230af 100644
--- a/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
+++ b/dev-ruby/ttfunk/ttfunk-1.4.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
index b6381265a652..2ae5842756d9 100644
--- a/dev-scheme/guile/guile-1.8.8-r2.ebuild
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/guile/"
SRC_URI="mirror://gnu/guile/${P}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
RESTRICT="!regex? ( test )"
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
index 8be9e2d307da..a8ae80a6da3e 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="LGPL-2 GPL-2 GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="interactivetests +threaded"
RDEPEND="dev-haskell/cairo:=
diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
index b2d2f03b58df..1faf995dd2d9 100644
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cmocka.org/files/1.0/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc static-libs test"
DEPEND="
diff --git a/dev-util/electron/electron-0.36.12.ebuild b/dev-util/electron/electron-0.36.12.ebuild
index 73d6199a6f78..47691b7deda2 100644
--- a/dev-util/electron/electron-0.36.12.ebuild
+++ b/dev-util/electron/electron-0.36.12.ebuild
@@ -54,7 +54,7 @@ LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
LICENSE="BSD"
SLOT="0/$(get_version_component_range 2)"
KEYWORDS="~amd64"
-IUSE="custom-cflags cups gnome gnome-keyring gtk3 hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
+IUSE="custom-cflags cups gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
# Native Client binaries are compiled with different set of flags, bug #452066.
@@ -100,8 +100,7 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
virtual/udev
x11-libs/cairo:=
x11-libs/gdk-pixbuf:=
- gtk3? ( x11-libs/gtk+:3= )
- !gtk3? ( x11-libs/gtk+:2= )
+ x11-libs/gtk+:2=
x11-libs/libdrm
x11-libs/libX11:=
x11-libs/libXcomposite:=
@@ -490,7 +489,6 @@ src_configure() {
$(gyp_use gnome use_gconf)
$(gyp_use gnome-keyring use_gnome_keyring)
$(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use gtk3)
$(gyp_use hidpi enable_hidpi)
$(gyp_use kerberos)
$(gyp_use lto)
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index d079fad69535..bc1cf74d7eb4 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -11,7 +11,6 @@
Electron is a cross platform application development framework based on web technologies based on Chromium