diff --git a/app-admin/389-console/389-console-1.1.7-r1.ebuild b/app-admin/389-console/389-console-1.1.7-r1.ebuild
index 79245f193258..25ca62955f9b 100644
--- a/app-admin/389-console/389-console-1.1.7-r1.ebuild
+++ b/app-admin/389-console/389-console-1.1.7-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-JAVA_PKG_IUSE=""
-
-inherit java-pkg-2 eutils java-ant-2
+inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="A Java based console for remote management 389 server"
HOMEPAGE="http://port389.org/"
@@ -15,17 +13,19 @@ SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2
LICENSE="LGPL-2.1"
SLOT="1.1"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-COMMON_DEP="dev-java/jss:3.4
+CDEPEND="
+ dev-java/jss:3.4
dev-java/ldapsdk:4.1
>=dev-java/idm-console-framework-1.1"
-RDEPEND="|| ( >=virtual/jre-1.6 >=virtual/jdk-1.6 )
- ${COMMON_DEP}"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEP}"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
src_prepare() {
java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
@@ -37,17 +37,16 @@ src_compile() {
eant -Dbuilt.dir="${S}"/build \
-Dldapjdk.local.location="${S}" \
-Djss.local.location="${S}" \
- -Dconsole.local.location="${S}" ${antflags} \
- || die "eant failed"
+ -Dconsole.local.location="${S}" ${antflags}
}
src_install() {
java-pkg_newjar "${S}"/build/389-console-${PV}_en.jar 389-console_en.jar
- java-pkg_dolauncher ${PN} --main com.netscape.management.client.console.Console \
+ java-pkg_dolauncher ${PN} \
+ --main com.netscape.management.client.console.Console \
--pwd "/usr/share/dirsrv/html/java/" \
- --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\"" \
- || die
+ --pkg_args "-Djava.util.prefs.systemRoot=\"\$HOME/.${PN}\" -Djava.util.prefs.userRoot=\"\$HOME/.${PN}\""
- doicon "${DISTDIR}"/fedora.png || die "doicon failed"
+ doicon "${DISTDIR}"/fedora.png
make_desktop_entry ${PN} "Port389 Management Console" fedora System
}
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index fd5a3c768527..10a620c3477b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,3 +1,3 @@
DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef
-DIST libarchive-3.3.0.tar.gz 6277298 SHA256 f9c80dece299c04dd5f601b523f6518ad90fef1575db9b278e81616cc860e20c SHA512 06c5b6469cee760719b2e3e2909d0098639dc4e38501a74fdab5e2abc695676a6e5e11aaa0a033e9badef45fdc4abd6d943c3f4b07dce19cc8b34b039c528529 WHIRLPOOL 086926f3bce77c86385d514730b69d4e8580a55b3c97a134c50c478ecccffebfc6f39d2d156b2739bb2401ad5a8342e1fb0f3e781c0f4bfcee71a9e710bc0abe
DIST libarchive-3.3.1.tar.gz 6219943 SHA256 29ca5bd1624ca5a007aa57e16080262ab4379dbf8797f5c52f7ea74a3b0424e7 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 WHIRLPOOL 07a8a5f700c62d61e82d6bb123b5e720041b1ea296c17f189d4494ef4dab58b2c4d428c12fe8221602c7ec5d8eca859f8c288fc9b9a51d8a511fb01051dc17ca
+DIST libarchive-3.3.2.tar.gz 6236562 SHA256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 WHIRLPOOL 6afc8dfca6474933383619e15c750b08ecd1553f3ff244c60cd43502b3d177be9633a2d2c80d9ea7846af21ae7dc59f32fd79cface4258a1b7b00e60e3a5f7a9
diff --git a/app-arch/libarchive/libarchive-3.3.0.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild
similarity index 79%
rename from app-arch/libarchive/libarchive-3.3.0.ebuild
rename to app-arch/libarchive/libarchive-3.3.2.ebuild
index 43da74eb0815..880de9e8b234 100644
--- a/app-arch/libarchive/libarchive-3.3.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.3.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib"
RDEPEND="
@@ -58,15 +58,19 @@ multilib_src_configure() {
$(use_with nettle)
$(use_with zlib)
)
- if multilib_is_native_abi ; then myconf+=(
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
- ); else myconf+=(
- --disable-bsdcat
- --disable-bsdcpio
- --disable-bsdtar
- ); fi
+ if multilib_is_native_abi ; then
+ myconf+=(
+ --enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+ --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+ --enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+ )
+ else
+ myconf+=(
+ --disable-bsdcat
+ --disable-bsdcpio
+ --disable-bsdtar
+ )
+ fi
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
@@ -98,10 +102,12 @@ multilib_src_install() {
done
fi
else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
+ local install_targets=(
+ install-includeHEADERS
+ install-libLTLIBRARIES
install-pkgconfigDATA
+ )
+ emake DESTDIR="${D}" "${install_targets[@]}"
fi
# Libs.private: should be used from libarchive.pc instead
diff --git a/app-arch/sharutils/sharutils-4.15.2.ebuild b/app-arch/sharutils/sharutils-4.15.2.ebuild
index 8338fc4cf99b..75da8ed243a1 100644
--- a/app-arch/sharutils/sharutils-4.15.2.ebuild
+++ b/app-arch/sharutils/sharutils-4.15.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
DEPEND="app-arch/xz-utils
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
index fac6cb846293..68fb80d3fb6d 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"
RDEPEND="sci-libs/gsl"
diff --git a/app-editors/moe/metadata.xml b/app-editors/moe/metadata.xml
index 2cb7edde3a31..6698a4ab7883 100644
--- a/app-editors/moe/metadata.xml
+++ b/app-editors/moe/metadata.xml
@@ -5,8 +5,4 @@
zlogene@gentoo.org
Mikle Kolyada
-
- pinkbyte@gentoo.org
- Sergey Popov
-
diff --git a/app-emulation/spice-protocol/Manifest b/app-emulation/spice-protocol/Manifest
index e5f6a22d5c17..d50622dec017 100644
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@@ -1 +1,2 @@
DIST spice-protocol-0.12.12.tar.bz2 80628 SHA256 17abdc2743b5d44b0f4423b61c44aafe9f2078c27218aeea78c2d02a5c409d03 SHA512 66e7a902b3c4a5a778cb91ffd9d324b12d414184146ac834dfb3bd81b4b6b1bb56258d3e1ce240b6f8747e1960fce8f0f6b0ada3617e9f9819be7118195fce6b WHIRLPOOL 15f7989e4508724dd43b435b0047a6f0bd6f1121ede74093012706007fe1d1755d51992e7085bbef37ee1bb0bb484141b8cdeb035b17280c70be23cb83ef66e7
+DIST spice-protocol-0.12.13.tar.bz2 73259 SHA256 89ee11b202d2268e061788e6ace114e1ff18c7620ae64d1ca3aba252ee7c9933 SHA512 55840020a7a538e72bf53d2124a6b1920dd2d567418cf02dc33783ae5c78154d5c832d69f2e6570453c4086194b417d10687884de20365c13657ad7ca7b2ae02 WHIRLPOOL 6ea2ac3361a3e52fd9e62b44a7c5c2fc189a71ca5c0f7f97a8f5775437a1090b67dc26114f28ebc25afe39c8181cddc34490d75cc704be5fbc33a1c4ff291649
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
new file mode 100644
index 000000000000..1ccdc7fcd4b6
--- /dev/null
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.13.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Headers defining the SPICE protocol"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index c18ecf297558..5e74a0d494c0 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -2,6 +2,7 @@ DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0
DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54
DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e
DIST wine-2.11.tar.xz 19251116 SHA256 efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c SHA512 691f329c47af5e51498287029988b8ca0777bfc3902ed80fd315004aba2337a938e79177e752efe86423c9b34544df3952b8c443bf43149356575fac75a779ac WHIRLPOOL 4933e1ce640b0abeebccd6969b5eaf4eec76cd135d9cfc1d904a902219f776a68f72e2bd1ae9019d69f0d0d81fd8ead0084785d1b9710590349365977f9c1817
+DIST wine-2.12.tar.xz 19301968 SHA256 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 SHA512 d44c1937d7d2d797150381f70317b810616d61355a59be096366d3507f59b678cffaf6d841cecf02bf9d2afa3dbf4d19270f80fb1d3ba5f0f93787d40c328f62 WHIRLPOOL 6f4b9baa6fcfe86f3d195fe603c2b9450a72a593c8f7042959b42a76880cb4ae680fde7beb70a8e823150849fda36c42985035de891ebf0088c8ffc2bceb15bf
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -14,6 +15,7 @@ DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0
DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
DIST wine-d3d9-2.10.tar.gz 48713 SHA256 62a199a239fca4f172f9ff871086196f8eeb35483d7bcab4acb144c05e60debb SHA512 808241f545e60c0546ff3918cac28e2abb6fe8496e8ade3cfa8bf81612724e827d31787d1d320cbac80b71a5d6180bcc8e51249c12c099e44637e0bb9f4875cd WHIRLPOOL a8c58c5321107b958780348aebad41d57ac0a3a307e176715950e1ed1eae7d19d858db3f9b0e5cb86484919d683321ff6fc19ec1696ba5418e0d2dd861bfaff4
DIST wine-d3d9-2.11.tar.gz 48714 SHA256 3432863940fdb9ea6f36688d670c6fe800e7359d7b18723828447bedf694b786 SHA512 716dad66fce962246e57a29c239d6b69b78656a11d01a421b490ad61c2c3dd9850b34e2346319a6a35c2a01e0c28193adf78f21b9de1ffde95a06d5fae51fe0d WHIRLPOOL eeef55dca716a68e03b84d4f916955c4194810c1c460a55a30ac2c4257e256b8fc709837d7b35aa86ce3f523f2b9c11222b9096ae4d87979f1fee4a8257ddabb
+DIST wine-d3d9-2.12.tar.gz 48716 SHA256 544e8b901b2fe1e0da90828f07683abf45794a3a41fdfae20eb5d29b5ee7d22b SHA512 8fe9b37ff54372984a234b18037bc736f69f2adf41478f037bc93e3d72893c46174fc3fbff78042ac66bb03d31ea85d293dbadc2b32630218ae53be8e360425d WHIRLPOOL 17f28bafb20c559424945ff92041a5c634b8775a8e97ed8aa940308fa815f2b3cfa48499a58a511fc5c33bde47db07008d168d8b0c103eec379ba27b33b8ffdd
DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413
DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
@@ -27,6 +29,7 @@ DIST wine-staging-2.0.tar.gz 10182575 SHA256 22a43cb50c1fff9c6f233a965247056e332
DIST wine-staging-2.1.tar.gz 10101781 SHA256 1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b SHA512 c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db WHIRLPOOL ecf970ef436089bbcd0088e1608b22e808d54560e905c7d8046b3e21508166a595c3ef7b69819c45e4b13183bd9134a2bd7016d29c4da52985701d392eb35a0a
DIST wine-staging-2.10.tar.gz 10091114 SHA256 b361ec92b2e40de983b987f6564dbb75dcb121c6e2f0123fe1ae234fd81a591b SHA512 c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7 WHIRLPOOL 01c5436179bcbd29ee0468f2f4d839ba805c064d80835fcd1d5e6eba562881c65ac576657a733c726ccf4b37473da6724ae06ebc023fb988d8810ed1f8096c6b
DIST wine-staging-2.11.tar.gz 10083147 SHA256 45c40fbca76cab987e7adfe47fc8e24692f896805c8a6dc6030da28e3bd842bc SHA512 e2d05ee88e1cc932c2890f1db867a9382f2c62a00ea7d63fc6bd7b3fab57ea2f0e4908313cbed08b92e48d5bc17753b0b78f6cdf2cb64e81aa5725fd86cbc695 WHIRLPOOL e2d13ed7d258b1ee442c8c87f852c1564ce5f262bd7cd31710b975882ab8cb454a1e2ec308c6c17e5bd0a691b0492fdea22a182323cb963c055592ce538db690
+DIST wine-staging-2.12.tar.gz 10105899 SHA256 0f186d2268011c12094ecac8747378ad8f4ee7152e8854cb00496ba9565b7974 SHA512 a8c21c923153a42609e3ea9065b84208b01f3b14d55b7e68e548ebf6d27df956051b29dc2f053aec6287422c13eed5b6ec71e667ae6f46b1c80ae7c84a51b648 WHIRLPOOL 01cf39fa257e9975cfd16976e680117dac3d0ea3f9bc41e2d0a636023bd4afba0676587e41c55d4417cff97080b90eb11b3fe475970eec70be64f5c788c1cf88
DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
diff --git a/app-emulation/wine-any/wine-any-2.12.ebuild b/app-emulation/wine-any/wine-any-2.12.ebuild
new file mode 100644
index 000000000000..96e7765c5732
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-2.12.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+ D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+ d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ test? ( abi_x86_32 )
+ themes? ( staging )
+ vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ d3d9? (
+ media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ themes? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ staging? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use staging; then
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+ git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+ local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+ einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+ fi
+ fi
+ if use d3d9; then
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+ git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE=""
+ STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $? || die "Failed to apply Wine-Staging patches"
+ fi
+ if use d3d9; then
+ if use staging; then
+ PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+ else
+ PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+ fi
+ PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with themes gtk3)
+ $(use_with vaapi va)
+ )
+ use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+ dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine register --staging ${P} || die
+ fi
+ if use d3d9; then
+ eselect wine register --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine deregister --staging ${P} || die
+ fi
+ if use d3d9; then
+ eselect wine deregister --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 0261a8bb8c4e..9362fd5407f9 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -2,6 +2,7 @@ DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0
DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54
DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e
DIST wine-2.11.tar.xz 19251116 SHA256 efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c SHA512 691f329c47af5e51498287029988b8ca0777bfc3902ed80fd315004aba2337a938e79177e752efe86423c9b34544df3952b8c443bf43149356575fac75a779ac WHIRLPOOL 4933e1ce640b0abeebccd6969b5eaf4eec76cd135d9cfc1d904a902219f776a68f72e2bd1ae9019d69f0d0d81fd8ead0084785d1b9710590349365977f9c1817
+DIST wine-2.12.tar.xz 19301968 SHA256 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 SHA512 d44c1937d7d2d797150381f70317b810616d61355a59be096366d3507f59b678cffaf6d841cecf02bf9d2afa3dbf4d19270f80fb1d3ba5f0f93787d40c328f62 WHIRLPOOL 6f4b9baa6fcfe86f3d195fe603c2b9450a72a593c8f7042959b42a76880cb4ae680fde7beb70a8e823150849fda36c42985035de891ebf0088c8ffc2bceb15bf
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -14,6 +15,7 @@ DIST wine-d3d9-2.0.tar.gz 48373 SHA256 7bfac23706723c6d51a7a95e416e47fb2678cd4d0
DIST wine-d3d9-2.1.tar.gz 48385 SHA256 9fd80e3e2ea905272c42dbc14679e94c8e2f955101ae098c84060d4c62ffc9c6 SHA512 9234d8227412d940a6befcf79433f1d5ab0634d5e829f3771ffeea235af05be29ffc40438818b1976c77d1e2e79da8a67c4dab2b7d2e822b502fb6e4a1a7f8b7 WHIRLPOOL 790e482850a13c5bf0967e900620c36d71c4d6673106f8f5c2848550ed574d326d3945d9906de88d847bb5644a520aab7fe6d460b3c3afd49a396798dd253392
DIST wine-d3d9-2.10.tar.gz 48713 SHA256 62a199a239fca4f172f9ff871086196f8eeb35483d7bcab4acb144c05e60debb SHA512 808241f545e60c0546ff3918cac28e2abb6fe8496e8ade3cfa8bf81612724e827d31787d1d320cbac80b71a5d6180bcc8e51249c12c099e44637e0bb9f4875cd WHIRLPOOL a8c58c5321107b958780348aebad41d57ac0a3a307e176715950e1ed1eae7d19d858db3f9b0e5cb86484919d683321ff6fc19ec1696ba5418e0d2dd861bfaff4
DIST wine-d3d9-2.11.tar.gz 48714 SHA256 3432863940fdb9ea6f36688d670c6fe800e7359d7b18723828447bedf694b786 SHA512 716dad66fce962246e57a29c239d6b69b78656a11d01a421b490ad61c2c3dd9850b34e2346319a6a35c2a01e0c28193adf78f21b9de1ffde95a06d5fae51fe0d WHIRLPOOL eeef55dca716a68e03b84d4f916955c4194810c1c460a55a30ac2c4257e256b8fc709837d7b35aa86ce3f523f2b9c11222b9096ae4d87979f1fee4a8257ddabb
+DIST wine-d3d9-2.12.tar.gz 48716 SHA256 544e8b901b2fe1e0da90828f07683abf45794a3a41fdfae20eb5d29b5ee7d22b SHA512 8fe9b37ff54372984a234b18037bc736f69f2adf41478f037bc93e3d72893c46174fc3fbff78042ac66bb03d31ea85d293dbadc2b32630218ae53be8e360425d WHIRLPOOL 17f28bafb20c559424945ff92041a5c634b8775a8e97ed8aa940308fa815f2b3cfa48499a58a511fc5c33bde47db07008d168d8b0c103eec379ba27b33b8ffdd
DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413
DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild
new file mode 100644
index 000000000000..5fb2ee574d01
--- /dev/null
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.12.ebuild
@@ -0,0 +1,551 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ D3D9_EGIT_REPO_URI="git://github.com/sarnex/wine-d3d9-patches.git"
+else
+ SRC_URI="${SRC_URI}
+ d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ d3d9? (
+ media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use d3d9; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use d3d9; then
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+ git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use d3d9; then
+ PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+ PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+ dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use d3d9; then
+ eselect wine register --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use d3d9; then
+ eselect wine deregister --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index c50e41ef10e0..e1a03080d13b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,6 +2,7 @@ DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0
DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54
DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e
DIST wine-2.11.tar.xz 19251116 SHA256 efa96dade206aa21accf0da195335a805d38209d6a14320607c6308ebde4cc3c SHA512 691f329c47af5e51498287029988b8ca0777bfc3902ed80fd315004aba2337a938e79177e752efe86423c9b34544df3952b8c443bf43149356575fac75a779ac WHIRLPOOL 4933e1ce640b0abeebccd6969b5eaf4eec76cd135d9cfc1d904a902219f776a68f72e2bd1ae9019d69f0d0d81fd8ead0084785d1b9710590349365977f9c1817
+DIST wine-2.12.tar.xz 19301968 SHA256 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 SHA512 d44c1937d7d2d797150381f70317b810616d61355a59be096366d3507f59b678cffaf6d841cecf02bf9d2afa3dbf4d19270f80fb1d3ba5f0f93787d40c328f62 WHIRLPOOL 6f4b9baa6fcfe86f3d195fe603c2b9450a72a593c8f7042959b42a76880cb4ae680fde7beb70a8e823150849fda36c42985035de891ebf0088c8ffc2bceb15bf
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -15,6 +16,7 @@ DIST wine-staging-2.0.tar.gz 10182575 SHA256 22a43cb50c1fff9c6f233a965247056e332
DIST wine-staging-2.1.tar.gz 10101781 SHA256 1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b SHA512 c64c48b265f0779c621a643ddbd2d12aaa548e4bff3b2b728280cdb9613214989911ee8ba5e46c7770f5f6430014a5da1c98e95d5008c1174bd14bf9ce5250db WHIRLPOOL ecf970ef436089bbcd0088e1608b22e808d54560e905c7d8046b3e21508166a595c3ef7b69819c45e4b13183bd9134a2bd7016d29c4da52985701d392eb35a0a
DIST wine-staging-2.10.tar.gz 10091114 SHA256 b361ec92b2e40de983b987f6564dbb75dcb121c6e2f0123fe1ae234fd81a591b SHA512 c3bf7027ddfd1405263cce844a7cbeb923e9de56cffdb296384449c0cc600b3c9a37c7fe09b62fb9ae0b47f97a2d4f208cc589f0e4205fa84ce5d112953ac2e7 WHIRLPOOL 01c5436179bcbd29ee0468f2f4d839ba805c064d80835fcd1d5e6eba562881c65ac576657a733c726ccf4b37473da6724ae06ebc023fb988d8810ed1f8096c6b
DIST wine-staging-2.11.tar.gz 10083147 SHA256 45c40fbca76cab987e7adfe47fc8e24692f896805c8a6dc6030da28e3bd842bc SHA512 e2d05ee88e1cc932c2890f1db867a9382f2c62a00ea7d63fc6bd7b3fab57ea2f0e4908313cbed08b92e48d5bc17753b0b78f6cdf2cb64e81aa5725fd86cbc695 WHIRLPOOL e2d13ed7d258b1ee442c8c87f852c1564ce5f262bd7cd31710b975882ab8cb454a1e2ec308c6c17e5bd0a691b0492fdea22a182323cb963c055592ce538db690
+DIST wine-staging-2.12.tar.gz 10105899 SHA256 0f186d2268011c12094ecac8747378ad8f4ee7152e8854cb00496ba9565b7974 SHA512 a8c21c923153a42609e3ea9065b84208b01f3b14d55b7e68e548ebf6d27df956051b29dc2f053aec6287422c13eed5b6ec71e667ae6f46b1c80ae7c84a51b648 WHIRLPOOL 01cf39fa257e9975cfd16976e680117dac3d0ea3f9bc41e2d0a636023bd4afba0676587e41c55d4417cff97080b90eb11b3fe475970eec70be64f5c788c1cf88
DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
diff --git a/app-emulation/wine-staging/wine-staging-2.12.ebuild b/app-emulation/wine-staging/wine-staging-2.12.ebuild
new file mode 100644
index 000000000000..bc539a6b1b9b
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-2.12.ebuild
@@ -0,0 +1,586 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ test? ( abi_x86_32 )
+ themes? ( staging )
+ vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ themes? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.0 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ staging? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use staging; then
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+ git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+ local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+ einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+ fi
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE=""
+ STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $? || die "Failed to apply Wine-Staging patches"
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with themes gtk3)
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
+ dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine register --staging ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine deregister --staging ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index a7e47796b9aa..577940b63253 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,2 +1,2 @@
-DIST FreeWnn-1.1.1-a021.tar.bz2 3108905 SHA256 df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86 SHA512 27a61949d4f9e969d09b7c698c07db0be8140e346dad4e84be72d54f9c087e317e7854ae02e2ebbd530b6b86b4a55c8d209a7dd27de1ed908731487aece5d7a8 WHIRLPOOL 3e34357a3925fdbedd1c71138053196799de9a7b0d5e3c1e23501a52cafac5eda52b6f33b5c75f7ed7e09174dfc36a63b25e3d7d620114b157e6dd82530f6013
DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 SHA256 3728352fe9d3352ce16884bd0a517eaf227da0cf7e6f1d09b7a3f38f6bfb6dba SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3 WHIRLPOOL f7462c2d6214ea416c8b726b0d086911b238efd39615c4eea5d2c1a9685974ce1c9f20d23d65e861753e64d796c8b98d72682d670d48bf5da80e8051df8d7de9
+DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 SHA256 88c81a9aae33151dcc66259637e5499b1fc313b7288d5b1e90d8dd6290c7a7e9 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385 WHIRLPOOL 1fa31f568346c69b2cd263ff336ae1eedb6da1d085827eb9b65634fe690f6148b4535f125881053bf6fe79de149f78af6e226c40d1ea278a4977403a36b4efd4
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch
deleted file mode 100644
index d46c91d80ae0..000000000000
--- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-gcc45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Wnn/pubdicplus/Makefile.in b/Wnn/pubdicplus/Makefile.in
-index 41c868d..e9ffc28 100644
---- a/Wnn/pubdicplus/Makefile.in
-+++ b/Wnn/pubdicplus/Makefile.in
-@@ -422,7 +422,7 @@ fzk.master-.c: fzk.master
- $(LN) $? $@
-
- std.fzk: fzk.master-.c $(FZK_SRC)
-- $(CPP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-+ $(CPP) -P $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@
-
- full.fzk: $(FZK_SRC)
- $(MAKE) FZK_FLAG=-DKANSAI std.fzk
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch
deleted file mode 100644
index f097892249e7..000000000000
--- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/makerule.mk.in b/makerule.mk.in
-index fa9a7e1..dc7210a 100644
---- a/makerule.mk.in
-+++ b/makerule.mk.in
-@@ -94,7 +94,7 @@ ALLDEFINES = $(INCLUDES) $(DEFINES)
- CFLAGS = @CFLAGS@ @CDEBUGFLAGS@ $(CCOPTIONS) @ipv6@ @DEFS@ $(ALLDEFINES)
- LIBS = @LIBS@
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
--LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS)
-+LDOPTIONS = @CDEBUGFLAGS@ $(CCOPTIONS) $(LDFLAGS)
-
-
- #
-diff --git a/Wnn/jlib.V3/Makefile.in b/Wnn/jlib.V3/Makefile.in
-index 9d5b873..5b1bf23 100644
---- a/Wnn/jlib.V3/Makefile.in
-+++ b/Wnn/jlib.V3/Makefile.in
-@@ -76,7 +76,7 @@ includes::
- all:: libjd.la
-
- libjd.la: $(OBJS) $(EXTRALIBRARYDEPS)
-- $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-+ $(LIBTOOL) $(CC) -o $@ $(LDOPTIONS) $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-
- lintlib:: llib-ljd.ln
-
diff --git a/app-i18n/freewnn/files/freewnn-Wformat-security.patch b/app-i18n/freewnn/files/freewnn-Wformat-security.patch
new file mode 100644
index 000000000000..b5b68314060d
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-Wformat-security.patch
@@ -0,0 +1,143 @@
+--- a/Wnn/uum/jhlp.c
++++ b/Wnn/uum/jhlp.c
+@@ -1135,7 +1135,7 @@
+ else
+ {
+ signal (SIGCHLD, SIG_IGN);
+- printf (MSG_GET (3));
++ printf ("%s", MSG_GET (3));
+ /*
+ printf("\r\n£õ£õ£í¤ò½ª¤ï¤ê¤Þ¤¹¡£\r\n");
+ */
+@@ -1212,8 +1212,8 @@
+
+ if ((buf = (unsigned char *) malloc (maxchg * 4)) == NULL)
+ {
+- printf (MSG_GET (2));
+- printf (MSG_GET (3));
++ printf ("%s", MSG_GET (2));
++ printf ("%s", MSG_GET (3));
+ /*
+ printf("malloc ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡££õ£õ£í¤ò½ª¤ï¤ê¤Þ¤¹¡£\r\n");
+ */
+--- a/Wnn/uum/jis_in.c
++++ b/Wnn/uum/jis_in.c
+@@ -64,7 +64,7 @@
+
+ completely_start:
+ throw_c (0); /* ¥â¡¼¥Éɽ¼¨¤Î¸å¤Ë½Ð¤¹ */
+- printf (MSG_GET (6));
++ printf ("%s", MSG_GET (6));
+ /*
+ printf("JIS¥³¡¼¥É: ");
+ */
+--- a/Wnn/uum/jutil.c
++++ b/Wnn/uum/jutil.c
+@@ -489,7 +489,7 @@
+ /*
+ printf("Âþº£¡¢¼½ñ¤òÆɤ߹þ¤ó¤Ç¤¤¤Þ¤¹¡£");
+ */
+- printf (MSG_GET (60));
++ printf ("%s", MSG_GET (60));
+ flush ();
+
+ if ((id = jl_dic_add (bun_data_, fname, hfname, 0, prio, rdonly, hrdonly, NULL, NULL, yes_or_no_or_newline, print_msg1)) == -1 && wnn_errorno != -1)
+@@ -571,7 +571,7 @@
+ int x;
+ throw_c (0);
+ clr_line ();
+- printf (string);
++ printf ("%s", string);
+ flush ();
+ for (;;)
+ {
+--- a/Wnn/uum/kensaku.c
++++ b/Wnn/uum/kensaku.c
+@@ -112,7 +112,7 @@
+ u_s_on ();
+ w_printf (kana_buf, maxlength - strlen (MSG_GET (27)) - 2);
+ u_s_off ();
+- printf (MSG_GET (27));
++ printf ("%s", MSG_GET (27));
+ flush ();
+ keyin ();
+ return (NULL);
+--- a/Wnn/uum/kuten.c
++++ b/Wnn/uum/kuten.c
+@@ -63,7 +63,7 @@
+
+ completely_start:
+ throw_c (0); /* ¥â¡¼¥Éɽ¼¨¤Î¸å¤Ë½Ð¤¹ */
+- printf (MSG_GET (7));
++ printf ("%s", MSG_GET (7));
+ /*
+ printf("¶èÅÀ : ");
+ */
+--- a/Wnn/uum/prologue.c
++++ b/Wnn/uum/prologue.c
+@@ -144,7 +144,7 @@
+ /*
+ fprintf(stderr,"½é´ü²½¤ÇmallocÉÔǽ¡£\n");
+ */
+- fprintf (stderr, MSG_GET (2));
++ fprintf (stderr, "%s", MSG_GET (2));
+ return (-1);
+ }
+
+--- a/Wnn/uum/screen.c
++++ b/Wnn/uum/screen.c
+@@ -547,7 +547,7 @@
+ {
+ push_cursor ();
+ throw_c (0);
+- printf (msg);
++ printf ("%s", msg);
+ pop_cursor ();
+ flush ();
+ }
+--- a/Wnn/uum/sdefine.h
++++ b/Wnn/uum/sdefine.h
+@@ -191,8 +191,8 @@
+
+
+ #define flush() fflush(stdout)
+-#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();pop_cursor();}
+-#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf(X);flush();keyin();pop_cursor();}
++#define print_msg(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();pop_cursor();}
++#define print_msg_getc(X) {push_cursor();throw_c(0); clr_line();printf("%s", X);flush();keyin();pop_cursor();}
+
+
+ #define UNDER_LINE_MODE (0x02 | 0x08 | 0x20)
+--- a/Wnn/uum/select_ele.c
++++ b/Wnn/uum/select_ele.c
+@@ -224,7 +224,7 @@
+
+ throw_c (0);
+ clr_line ();
+- printf (msg);
++ printf ("%s", msg);
+ for (k = dd[cc]; k < dd[cc + 1]; k++)
+ {
+ cp = findcp (k, cc);
+--- a/Wnn/uum/termio.c
++++ b/Wnn/uum/termio.c
+@@ -100,7 +100,7 @@
+
+ if ((strlen (Term_Name) > 2) && (strcmp (Term_Name + (strlen (Term_Name) - 2), "-j") == 0))
+ {
+- fprintf (stderr, MSG_GET (4));
++ fprintf (stderr, "%s", MSG_GET (4));
+ /*
+ fprintf(stderr,"Uum:£õ£õ£í¤«¤é£õ£õ£í¤Ï¤ª¤³¤»¤Þ¤»¤ó¡£\n");
+ */
+--- a/Wnn/uum/wnnrc_op.c
++++ b/Wnn/uum/wnnrc_op.c
+@@ -754,7 +754,7 @@
+ return fp;
+ }
+ error:
+- fprintf (stderr, MSG_GET (14));
++ fprintf (stderr, "%s", MSG_GET (14));
+ /*
+ fprintf(stderr , "uumrc ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£");
+ */
diff --git a/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
new file mode 100644
index 000000000000..919492d912c6
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-uum-EUC-JP.patch
@@ -0,0 +1,13 @@
+--- a/Wnn/include/wnn_config.h
++++ b/Wnn/include/wnn_config.h
+@@ -149,8 +149,8 @@
+ #define TTY_KCODE J_EUJIS
+ #define PTY_KCODE J_EUJIS
+ # else /* !DGUX */
+-#define TTY_KCODE J_JIS
+-#define PTY_KCODE J_JIS
++#define TTY_KCODE J_EUJIS
++#define PTY_KCODE J_EUJIS
+ # endif
+ #endif
+
diff --git a/app-i18n/freewnn/files/freewnn.initd b/app-i18n/freewnn/files/freewnn.initd
index fda9184a5078..ef4e20cf37c8 100644
--- a/app-i18n/freewnn/files/freewnn.initd
+++ b/app-i18n/freewnn/files/freewnn.initd
@@ -1,22 +1,16 @@
#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
-depend() {
- use net
-}
+command="/usr/bin/Wnn4/jserver"
-start() {
- ebegin "Starting up ${SERVICE}"
- /usr/bin/Wnn4/jserver &>/dev/null
- if [ $? -eq 15 ]; then
- true;
- else
- false;
- fi
- eend 0
+depend() {
+ use logger
+ need net
}
stop() {
- ebegin "Stopping ${SERVICE}"
- /usr/bin/Wnn4/wnnkill &> /dev/null
- eend $? "Failed to stop ${SERVICE}"
+ ebegin "Stopping ${name:-${RC_SVCNAME}}"
+ /usr/bin/Wnn4/wnnkill
+ eend ${?}
}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild
deleted file mode 100644
index 73db9d541c2b..000000000000
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha21-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-MY_P="FreeWnn-${PV/_alpha/-a0}"
-
-DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://freewnn.sourceforge.jp/
- http://www.freewnn.org/"
-SRC_URI="mirror://sourceforge.jp/freewnn/17724/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X ipv6"
-
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- #Change WNNOWNER to root so we don't need to add wnn user
- # and disable stripping of binary files
- sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
- -e "s/@INSTPGMFLAGS@//" makerule.mk.in || die
-
- #bug #318593
- epatch "${FILESDIR}"/${P}-gcc45.patch
-
- epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
- econf \
- --disable-cWnn \
- --disable-kWnn \
- --without-termcap \
- $(use_with X x) \
- $(use_with ipv6) \
- || die
- emake -j1 || die
-}
-
-src_install() {
- # install executables, libs ,dictionaries
- emake DESTDIR="${D}" install || die
- # install man pages
- emake DESTDIR="${D}" install.man || die
- # install docs
- dodoc ChangeLog* CONTRIBUTORS
- # install rc script
- newinitd "${FILESDIR}"/freewnn.initd freewnn
-}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
index 0a7b948bba65..f4d5668b35ee 100644
--- a/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha22.ebuild
@@ -1,60 +1,54 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit eutils
+EAPI="6"
MY_P="FreeWnn-${PV/_alpha/-a0}"
DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
-HOMEPAGE="http://freewnn.sourceforge.jp/
- http://www.freewnn.org/"
-SRC_URI="mirror://sourceforge.jp/freewnn/59257/${MY_P}.tar.bz2"
+HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
+SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X ipv6"
-
-DEPEND="X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt )"
-RDEPEND="${DEPEND}"
+IUSE="ipv6"
S="${WORKDIR}/${MY_P}"
-src_prepare() {
- #Change WNNOWNER to root so we don't need to add wnn user
- # and disable stripping of binary files
- sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
- -e "s/@INSTPGMFLAGS@//" makerule.mk.in \
- -e "s/@LN_S@/ln -sf/" || die
-
- #bug #318593
+PATCHES=(
+ "${FILESDIR}"/${P}-parallel-build.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="ChangeLog* CONTRIBUTORS"
- epatch "${FILESDIR}"/${P}-parallel-build.patch #517916
-
- # 542534
- sed -i -e "s/egrep -v/egrep -av/" kWnn/kdic/Makefile.in \
- cWnn/tdic/Makefile.in cWnn/cdic/Makefile.in \
- Wnn/pubdicplus/Makefile.in || die
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
+ -e "s/@INSTPGMFLAGS@//" \
+ makerule.mk.in
+
+ # bug #542534
+ sed -i \
+ -e "s/egrep -v/egrep -av/" \
+ PubdicPlus/Makefile.in \
+ Wnn/pubdicplus/Makefile.in \
+ cWnn/[ct]dic/Makefile.in \
+ kWnn/kdic/Makefile.in
}
src_configure() {
econf \
+ $(use_with ipv6) \
--disable-cWnn \
- --disable-kWnn \
- --without-termcap \
- $(use_with X x) \
- $(use_with ipv6)
+ --disable-kWnn
}
src_install() {
- # install executables, libs ,dictionaries
- emake DESTDIR="${ED}" install || die
- # install man pages
- emake DESTDIR="${ED}" install.man || die
- # install docs
- dodoc ChangeLog* CONTRIBUTORS
- # install rc script
- newinitd "${FILESDIR}"/freewnn.initd freewnn
+ emake DESTDIR="${D}" install install.man
+ einstalldocs
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
}
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
new file mode 100644
index 000000000000..e6dae1fef125
--- /dev/null
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_P="FreeWnn-${PV/_alpha/-a0}"
+
+DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
+HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/"
+SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 uum"
+
+RDEPEND="uum? ( sys-libs/ncurses:= )"
+DEPEND="${RDEPEND}
+ uum? ( virtual/pkgconfig )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-uum-EUC-JP.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
+)
+DOCS="ChangeLog* CONTRIBUTORS"
+
+src_prepare() {
+ sed -i \
+ -e "s/WNNOWNER = wnn/WNNOWNER = root/" \
+ -e "s|@mandir@/|@mandir@/ja/|" \
+ -e "s/@INSTPGMFLAGS@//" \
+ makerule.mk.in
+
+ # bug #542534
+ sed -i \
+ -e "s/egrep -v/egrep -av/" \
+ PubdicPlus/Makefile.in \
+ Wnn/pubdicplus/Makefile.in \
+ cWnn/[ct]dic/Makefile.in \
+ kWnn/kdic/Makefile.in
+
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable uum client) \
+ $(use_with ipv6) \
+ --disable-cWnn \
+ --disable-kWnn \
+ --disable-traditional-layout \
+ --with-term-libs="$(pkg-config --libs ncurses)"
+}
+
+src_compile() {
+ default
+
+ local m
+ for m in $(find Wnn/man -name "*.man"); do
+ iconv -f EUC-JP -t UTF-8 "${m}" > "${m}".UTF-8 || die
+ mv "${m}"{.UTF-8,} || die
+ done
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install.man
+ einstalldocs
+
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+}
diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml
index a20c4e7b6017..00f1f852743c 100644
--- a/app-i18n/freewnn/metadata.xml
+++ b/app-i18n/freewnn/metadata.xml
@@ -1,11 +1,14 @@
-
- cjk@gentoo.org
- Cjk
-
-
- freewnn
-
+
+ cjk@gentoo.org
+ Cjk
+
+
+
+ freewnn
+
diff --git a/app-i18n/kimera/files/kimera-2.11-underlinking.patch b/app-i18n/kimera/files/kimera-underlinking.patch
similarity index 82%
rename from app-i18n/kimera/files/kimera-2.11-underlinking.patch
rename to app-i18n/kimera/files/kimera-underlinking.patch
index dab4b63e7c14..0a00171afd60 100644
--- a/app-i18n/kimera/files/kimera-2.11-underlinking.patch
+++ b/app-i18n/kimera/files/kimera-underlinking.patch
@@ -1,5 +1,3 @@
-diff --git a/kimera.pro b/kimera.pro
-index 0d4f0be..a2b63da 100644
--- a/kimera.pro
+++ b/kimera.pro
@@ -90,7 +90,7 @@ SOURCES = \
diff --git a/app-i18n/kimera/files/xinput-kimera b/app-i18n/kimera/files/xinput-kimera
new file mode 100644
index 000000000000..080c0233af49
--- /dev/null
+++ b/app-i18n/kimera/files/xinput-kimera
@@ -0,0 +1,4 @@
+XIM=kimera
+XIM_PROGRAM="@EPREFIX@/usr/bin/kimera"
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
diff --git a/app-i18n/kimera/kimera-2.11-r1.ebuild b/app-i18n/kimera/kimera-2.11-r1.ebuild
index e01c230b51a3..289f4b79a7b5 100644
--- a/app-i18n/kimera/kimera-2.11-r1.ebuild
+++ b/app-i18n/kimera/kimera-2.11-r1.ebuild
@@ -1,33 +1,38 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=3
-inherit qt4-r2 eutils multilib
+EAPI="6"
+
+inherit qmake-utils
DESCRIPTION="A Japanese input method which supports the XIM protocol"
-SRC_URI="mirror://sourceforge.jp/kimera/37271/${P}.tar.gz"
-HOMEPAGE="http://kimera.sourceforge.jp/"
+HOMEPAGE="http://kimera.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/37271/${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-3"
+SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+anthy"
-DEPEND="dev-qt/qtcore:4
+RDEPEND="dev-qt/qt3support:4
+ dev-qt/qtcore:4
dev-qt/qtgui:4
- dev-qt/qt3support:4
anthy? ( app-i18n/anthy )
!anthy? ( app-i18n/canna )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
-DOCS="AUTHORS README*"
+PATCHES=( "${FILESDIR}"/${PN}-underlinking.patch )
src_configure() {
- local myconf="target.path=/usr/$(get_libdir)/${P}"
- use anthy || myconf="${myconf} no_anthy=1"
- eqmake4 kimera.pro ${myconf}
+ local myconf=(
+ script.path="${EPREFIX}"/usr/bin
+ target.path="${EPREFIX}"/usr/$(get_libdir)/${P}
+ no_anthy=$(usex anthy 1 0)
+ )
+ eqmake4 ${PN}.pro "${myconf[@]}"
}
-src_prepare() {
- epatch "${FILESDIR}"/${P}-underlinking.patch
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
}
diff --git a/app-i18n/kimera/kimera-2.11-r2.ebuild b/app-i18n/kimera/kimera-2.11-r2.ebuild
new file mode 100644
index 000000000000..2be50304e3ba
--- /dev/null
+++ b/app-i18n/kimera/kimera-2.11-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit qmake-utils
+
+DESCRIPTION="A Japanese input method which supports the XIM protocol"
+HOMEPAGE="http://kimera.osdn.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/37271/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+anthy"
+
+RDEPEND="dev-qt/qt3support:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ anthy? ( app-i18n/anthy )
+ !anthy? ( app-i18n/canna )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-underlinking.patch )
+
+src_configure() {
+ local myconf=(
+ script.path="${EPREFIX}"/usr/bin
+ target.path="${EPREFIX}"/usr/$(get_libdir)/${P}
+ no_anthy=$(usex anthy 1 0)
+ )
+ eqmake4 ${PN}.pro "${myconf[@]}"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+
+ insinto /etc/X11/xinit/xinput.d
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX}:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
+}
diff --git a/app-i18n/kimera/metadata.xml b/app-i18n/kimera/metadata.xml
index d9263b15bbe6..6a876a223eb9 100644
--- a/app-i18n/kimera/metadata.xml
+++ b/app-i18n/kimera/metadata.xml
@@ -6,11 +6,11 @@
Cjk
-Kimera is a Qt-based Japanese input method bridge.
-Currently it supports Canna and Anthy.
-
+ Kimera is a Qt-based Japanese input method bridge.
+ Currently it supports Canna and Anthy.
+
kimera
diff --git a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff b/app-i18n/kinput2/files/kinput2-gentoo.patch
similarity index 72%
rename from app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
rename to app-i18n/kinput2/files/kinput2-gentoo.patch
index d4c03d527c4d..2c22723b3851 100644
--- a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
---- kinput2-v3.1.orig/Kinput2.conf 2002-10-03 18:35:26.000000000 +0900
-+++ kinput2-v3.1/Kinput2.conf 2003-08-13 15:51:21.000000000 +0900
+--- a/Kinput2.conf
++++ b/Kinput2.conf
@@ -17,8 +17,8 @@
/* #define UseWnn */ /* define if you are going to use Wnn (v4, v6 or v7) */
@@ -17,7 +16,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
* are not installed in /usr/local/lib/wnn (which is the default).
*/
-/* #define WnnLibDir /some/peculiar/directory/wnn */
-+#define WnnLibDir /usr/lib/wnn
++#define WnnLibDir $(EPREFIX)/usr/lib/wnn
/* for convenience.. */
#if defined(UseWnn6) && !defined(UseWnn)
@@ -26,7 +25,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
*/
XCOMM use installed header files
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-+WNNINCDIR = /usr/include/wnn
++WNNINCDIR = $(EPREFIX)/usr/include/wnn
XCOMM use installed library
-XCOMM WNNLIB = -lwnn
+WNNLIB = -lwnn
@@ -51,7 +50,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = /usr
++CANNAINSTDIR = $(EPREFIX)/usr
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -lcanna16
@@ -98,28 +97,3 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
/**
-diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c
---- kinput2-v3.1.orig/cmd/kinput2.c 2002-10-03 18:35:26.000000000 +0900
-+++ kinput2-v3.1/cmd/kinput2.c 2003-08-13 15:51:21.000000000 +0900
-@@ -644,3 +644,8 @@
- return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
-diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
---- kinput2-v3.1.orig/lib/imlib/imconv.c 2002-10-03 18:35:30.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imconv.c 2003-08-13 15:55:54.000000000 +0900
-@@ -591,6 +591,9 @@
- }
- }
- IMFinishRequest(conn, offset);
-+ #ifdef STATUS_SYNC
-+ IMFlush(conn);
-+ #endif /* STATUS_SYNC */
- }
-
- /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch b/app-i18n/kinput2/files/kinput2-headers.patch
new file mode 100644
index 000000000000..0075f710e9b6
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-headers.patch
@@ -0,0 +1,101 @@
+--- a/cmd/kinput2.c
++++ b/cmd/kinput2.c
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/lib/Canna.c
++++ b/lib/Canna.c
+@@ -50,6 +50,7 @@
+ static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
+ #endif
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/CcWnn.c
++++ b/lib/CcWnn.c
+@@ -2754,6 +2754,7 @@
+ wchar wbuf[1024];
+ int wlen;
+ int len;
++ extern int convJWStoCT();
+
+ TRACE(("CcWnn:saveYomiAndKanji()\n"));
+
+--- a/lib/ConvCtrl.c
++++ b/lib/ConvCtrl.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/KIProto.c
++++ b/lib/KIProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+ #include
+--- a/lib/XimpProto.c
++++ b/lib/XimpProto.c
+@@ -18,6 +18,7 @@
+ * Author: Makoto Ishisone, Software Research Associates, Inc., Japan
+ */
+
++#include
+ #include
+ #include
+
+--- a/lib/cconv.c
++++ b/lib/cconv.c
+@@ -604,6 +604,7 @@
+ #endif
+
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/lib/ctext.c
++++ b/lib/ctext.c
+@@ -71,6 +71,8 @@
+ static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
+ #endif
+
++#include
++
+ typedef unsigned short wchar;
+
+ #define NULL 0
+--- a/lib/ioecall.c
++++ b/lib/ioecall.c
+@@ -23,6 +23,7 @@
+ */
+
+ #include
++#include
+ #include
+ #include
+ #include "IOECall.h"
+--- a/lib/wnnlib.c
++++ b/lib/wnnlib.c
+@@ -578,6 +578,7 @@
+ #ifdef DEBUG_WNNLIB
+ #include
+ #endif
++#include
+ #include "wnnlib.h"
+ #include "WStr.h"
+ #include
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch
new file mode 100644
index 000000000000..897b154eb5ac
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-ppc.patch
@@ -0,0 +1,11 @@
+--- a/cmd/kinput2.c
++++ b/cmd/kinput2.c
+@@ -644,3 +644,8 @@
+ return n;
+ }
+ #endif
++
++#if defined(linux) && defined(PPC)
++/* avoid nusty gcc bug */
++void _XtInherit() {}
++#endif
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch
new file mode 100644
index 000000000000..9b3a83163b4f
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-segfault.patch
@@ -0,0 +1,12 @@
+--- a/lib/imlib/imconv.c
++++ b/lib/imlib/imconv.c
+@@ -591,6 +591,9 @@
+ }
+ }
+ IMFinishRequest(conn, offset);
++ #ifdef STATUS_SYNC
++ IMFlush(conn);
++ #endif /* STATUS_SYNC */
+ }
+
+ /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
new file mode 100644
index 000000000000..4e7001938fb2
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch
@@ -0,0 +1,51 @@
+--- a/lib/cconv.c
++++ b/lib/cconv.c
+@@ -790,7 +790,7 @@
+ static int parseLine(uchar *, uchar **, int);
+ static FILE *openfile(char *);
+ static int doinclude(uchar *, Files *, void (*)());
+-static uchar *getline(uchar *, int, Files *, void (*)());
++static uchar *getLine(uchar *, int, Files *, void (*)());
+ static int readRuleFile(ccRule, char *);
+ static int registMode(ccRule, int, uchar **);
+ static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
+@@ -1035,8 +1035,8 @@
+ return 0;
+ }
+
+-/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
+-static uchar *getline(line, linesize, files, efunc)
++/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
++static uchar *getLine(line, linesize, files, efunc)
+ uchar *line;
+ int linesize;
+ Files *files;
+@@ -1100,7 +1100,7 @@
+ rule->nmode = 0;
+ rule->initialmode = -1;
+
+- while (getline(line, sizeof(line), &files, efunc)) {
++ while (getLine(line, sizeof(line), &files, efunc)) {
+ (void)Strcpy(tmp, line);
+ if ((argc = parseLine(tmp, argv, 20)) == 0)
+ continue;
+@@ -1269,7 +1269,7 @@
+ cdbuf.cdbuf = NULL;
+
+ /* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
+- while (getline(line, sizeof(line), files, efunc)) {
++ while (getLine(line, sizeof(line), files, efunc)) {
+ /* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
+ if (*line == '\0' || *line == '\n' || *line == '#')
+ continue;
+--- a/lib/wnnlib.c
++++ b/lib/wnnlib.c
+@@ -1367,7 +1367,7 @@
+
+ /* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
+ clp = buf->clauseInfo + cl;
+- len = jl_kanji_len(buf->wnn, cl);
++ len = jl_kanji_len(buf->wnn, cl, -1);
+ diff = len - ((clp + 1)->dispp - clp->dispp);
+ newlen = (buf->displayEnd - buf->displayBuf) + diff;
+ if (newlen > buf->bufferSize) {
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
index 16de07ca4f7e..dcb3b63330ac 100644
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -1,5 +1,5 @@
XIM=kinput2
-XIM_PROGRAM=@EPREFIX@/usr/bin/kinput2
+XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
XIM_ARGS="-@SERVER@ +kinput -xim"
GTK_IM_MODULE=xim
QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 7badd093e352..d18b1cdc75d1 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,59 +1,70 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils
+EAPI="6"
+
+inherit toolchain-funcs
MY_P="${PN}-v${PV}"
+
DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna/"
+HOMEPAGE="http://www.nec.co.jp/canna"
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ppc64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE="freewnn"
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
+ x11-libs/libXext
x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt"
-
+ x11-libs/libXpm
+ x11-libs/libXt
+ !freewnn? ( app-i18n/canna )
+ freewnn? ( app-i18n/freewnn )"
DEPEND="${RDEPEND}
x11-misc/gccmakedep
- x11-misc/imake
- app-text/rman"
-
+ x11-misc/imake"
S="${WORKDIR}/${MY_P}"
-src_unpack() {
- local mysed=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-ppc.patch
+ "${FILESDIR}"/${PN}-segfault.patch
+ "${FILESDIR}"/${PN}-wnn.patch
+)
+DOCS=( README NEWS doc/. )
- unpack ${A}
- epatch "${FILESDIR}/${PF}-gentoo.diff"
+src_prepare() {
+ default
- if use freewnn; then
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' "${S}/Kinput2.conf"
- else
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' "${S}/Kinput2.conf"
- fi
+ sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
}
-src_compile() {
+src_configure() {
xmkmf -a || die
+}
+
+src_compile() {
emake \
- XAPPLOADDIR="/usr/share/X11/app-defaults/" \
+ CC="$(tc-getCC)" \
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
- || die
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
}
src_install() {
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
- rm -rf "${D}/usr/lib/X11"
-
- dodoc README NEWS doc/*
+ emake \
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+ DESTDIR="${D}" \
+ install
+ einstalldocs
newman cmd/${PN}.man ${PN}.1
+
+ rm -rf "${ED}"/usr/$(get_libdir)/X11
}
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index ccdfc9770d1e..864011015526 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="3"
-inherit eutils
+EAPI="6"
+
+inherit toolchain-funcs
MY_P="${PN}-v${PV}"
+
DESCRIPTION="A Japanese input server which supports the XIM protocol"
-HOMEPAGE="http://www.nec.co.jp/canna/"
+HOMEPAGE="http://www.nec.co.jp/canna"
SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
LICENSE="HPND"
@@ -14,29 +16,34 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="freewnn"
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
- !freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+ x11-libs/libSM
x11-libs/libX11
x11-libs/libXaw
+ x11-libs/libXext
x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXt"
-
+ x11-libs/libXpm
+ x11-libs/libXt
+ !freewnn? ( app-i18n/canna )
+ freewnn? ( app-i18n/freewnn )"
DEPEND="${RDEPEND}
x11-misc/gccmakedep
- x11-misc/imake
- app-text/rman"
-
+ x11-misc/imake"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-ppc.patch
+ "${FILESDIR}"/${PN}-segfault.patch
+ "${FILESDIR}"/${PN}-wnn.patch
+)
+DOCS=( README NEWS doc/. )
+
src_prepare() {
- epatch "${FILESDIR}/${P}-r1-gentoo.diff"
+ default
- if use freewnn; then
- sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die
- else
- sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf || die
- fi
+ sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
}
src_configure() {
@@ -45,30 +52,26 @@ src_configure() {
src_compile() {
emake \
- XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults/" \
+ CC="$(tc-getCC)" \
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
- || die
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
}
src_install() {
- emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
- rm -rf "${ED}/usr/lib/X11" || die
+ emake \
+ XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+ DESTDIR="${D}" \
+ install
+ einstalldocs
+ newman cmd/${PN}.man ${PN}.1
- local server
- if use freewnn; then
- server="wnn"
- else
- server="canna"
- fi
+ rm -rf "${ED}"/usr/$(get_libdir)/X11
insinto /etc/X11/xinit/xinput.d
sed \
-e "s:@EPREFIX@:${EPREFIX}:g" \
- -e "s:@SERVER@:${server}:g" \
- "${FILESDIR}/xinput-kinput2" > "${T}/kinput2.conf" || die
- doins "${T}/kinput2.conf" || die
-
- dodoc README NEWS doc/* || die
- newman cmd/${PN}.man ${PN}.1 || die
+ -e "s:@SERVER@:$(usex freewnn wnn canna):g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
}
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index c921b96adf6c..e1a49f498885 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,8 +1,8 @@
-
- cjk@gentoo.org
- Cjk
-
+
+ cjk@gentoo.org
+ Cjk
+
diff --git a/app-i18n/libkkc/libkkc-0.3.5.ebuild b/app-i18n/libkkc/libkkc-0.3.5.ebuild
index 62e8f38e5140..05430798a652 100644
--- a/app-i18n/libkkc/libkkc-0.3.5.ebuild
+++ b/app-i18n/libkkc/libkkc-0.3.5.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit ltprune python-any-r1 vala
+inherit ltprune python-any-r1 vala xdg-utils
DESCRIPTION="Japanese Kana Kanji conversion input method library"
HOMEPAGE="https://github.com/ueno/libkkc"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
src_prepare() {
vala_src_prepare
default
+ xdg_environment_reset
}
src_configure() {
diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 484033cda182..6791f3dc3ad1 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1,3 +1 @@
-DIST man-pages-ru_3.81-2230-2080-20160117.tar.bz2 1119715 SHA256 225c2e4eeb1a9071ab995b446cecfec51b24b2034191133c2035ad8c540a921b SHA512 2d38d4aca0d247f6f23556e58f5538510e58596146d481e72b6d70c9282b8ec24f79da1c7525612f8b4e968cd7049f2ba51eb40804804ba6d9aeb39f4b4d12dc WHIRLPOOL 9fdef40b11119fff41dbe099c321fc7358d9df391e5a55a5d0ea1a8b2691fd5666755ed70e497501ef182ffa4b5e5c738386377f7feb29cc6f09001101ee88ed
-DIST man-pages-ru_4.08-2329-2269-20170309.tar.bz2 1464870 SHA256 367b6eadc2076791d1dad67e47ff534de3fa6fc81d8eeafe4d081e1e52b76e7b SHA512 cb87d2e7c975577ff71a5b4ce24ab4998ba2f67e6248ee489620bcd6387e5b568e2d4f9aaa3ebb7ea388136f84876cbef8e348816cf6ab67af892d01f0b9eb77 WHIRLPOOL 8cc27cde0320f674f3dcc1c6c88e6fe5b39ec6cffe56dcd25fd74627a880a6b9173e512020d2e64c04ea000240d694f49dd8b19b2a42f543ab004a318c068283
DIST man-pages-ru_4.08-2329-2329-20170422.tar.bz2 1543256 SHA256 beccdb2868e1101ee7d4bcabe2b2e2db73d6cb6bc80eb3674858335dd49976ef SHA512 4cfb9b67118d0b3ed44d7ec2f5cbd3e711e738225fe528e7a80c9503bc9136bbf81423772ce9e25abd46f172b90dcee931ebfec26ed79a6bf6d36cc0287af51f WHIRLPOOL 181c5ab3d063c064f75b87ec519533bd54286045d1a7e6fee3536b62b4595c9dd68a3fc9aa44be9fa3d2cc4cecdcb0894ced5733a1e6efd38c5f2c95af45f1fc
diff --git a/app-i18n/man-pages-ru/man-pages-ru-3.81.2230.2080.20160117.ebuild b/app-i18n/man-pages-ru/man-pages-ru-3.81.2230.2080.20160117.ebuild
deleted file mode 100644
index b1128273aa27..000000000000
--- a/app-i18n/man-pages-ru/man-pages-ru-3.81.2230.2080.20160117.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
-
-DESCRIPTION="A collection of Russian translations of Linux manual pages"
-HOMEPAGE="http://man-pages-ru.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="virtual/man"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-src_install() {
- insinto /usr/share/man/ru
- doins -r man*
- dodoc README
-}
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2269.20170309.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2269.20170309.ebuild
deleted file mode 100644
index ec58b1873370..000000000000
--- a/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2269.20170309.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
-
-DESCRIPTION="A collection of Russian translations of Linux manual pages"
-HOMEPAGE="http://man-pages-ru.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
-
-LICENSE="FDL-1.3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="virtual/man"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-src_install() {
- insinto /usr/share/man/ru
- doins -r man*
- dodoc README
-}
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild
index 786f26a0d817..ec58b1873370 100644
--- a/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.08.2329.2329.20170422.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
LICENSE="FDL-1.3"
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"
DEPEND=""
RDEPEND="virtual/man"
diff --git a/app-i18n/skkserv/files/skkserv.initd b/app-i18n/skkserv/files/skkserv.initd
index f01e98c8bd8b..0721205b355a 100644
--- a/app-i18n/skkserv/files/skkserv.initd
+++ b/app-i18n/skkserv/files/skkserv.initd
@@ -6,14 +6,14 @@ extra_started_commands="reload"
description_reload="Reload the SKK-JISYO.L"
-command="/usr/sbin/${SVCNAME}"
+command="/usr/sbin/${RC_SVCNAME}"
depend() {
need net
}
reload() {
- ebegin "Reloading ${SVCNAME}"
+ ebegin "Reloading ${name:-${RC_SVCNAME}}"
start-stop-daemon --signal INT --name "${command}"
eend ${?}
}
diff --git a/app-i18n/yaskkserv/files/yaskkserv.initd b/app-i18n/yaskkserv/files/yaskkserv.initd
index b9ae738b92ac..d2e5aefd9e10 100644
--- a/app-i18n/yaskkserv/files/yaskkserv.initd
+++ b/app-i18n/yaskkserv/files/yaskkserv.initd
@@ -2,10 +2,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-command="/usr/sbin/${SVCNAME}_${YASKKSERV_SERVER_TYPE}"
+command="/usr/sbin/${RC_SVCNAME}_${YASKKSERV_SERVER_TYPE}"
command_args="--no-daemonize ${YASKKSERV_OPTS}"
command_background="true"
-pidfile="${pidfile:-/run/${SVCNAME}.pid}"
+pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}"
depend() {
need net
diff --git a/app-misc/crunch/Manifest b/app-misc/crunch/Manifest
index 69042a6e318f..df53bb472849 100644
--- a/app-misc/crunch/Manifest
+++ b/app-misc/crunch/Manifest
@@ -1,3 +1 @@
-DIST crunch-3.4.tgz 38388 SHA256 cd3b46409a1d8a3adeac68b1b618b2773c7dd4085d61e37f9d02a2060f261922 SHA512 b433c4cb0eb42ce4e76bb8c77d26f3738bd73f925d69c1e4220ac186daf6b8afe20665dfb87e0e869b0a3bb91fb76f1b341a438cd219afa0629ca961c13a71a8 WHIRLPOOL b089c2306f7a4fbf5412f7667bdb521b24748f4786c2b80ae0dea78efb3e1144b53507a66a242842b73499e01ced3f7ff867b562eed6a20ee1bced2731e9d39d
-DIST crunch-3.5.tgz 38459 SHA256 471195d9503f3420ffe80da00c1bc2e392e9bf39918ddda3cf0eaf5ef5627fda SHA512 70280e290fae392a1bd2c07f0235945438f81bccad055fe69d2ac94fedfd5f95fc22ba528be7671bb68fd33c824171fd03589d72bd089e806ff22d88c6e6e087 WHIRLPOOL 7a3b78cdb22362ca6d2c5d1b0898a3131726bc0b505aff20f6314c5ae5e17108998d123552797e3d834301d823a70eff56eb39264f2c810c0741ab2178bf3743
DIST crunch-3.6.tgz 38635 SHA256 6a8f6c3c7410cc1930e6854d1dadc6691bfef138760509b33722ff2de133fe55 SHA512 85a2a12bb481988ab27a19602122abc29bb307de0af279132dcc0565dfc4ba44ab9f7ca15d876001f2e6dcf7be77ed50168cb066fc6a65bf06ec5cf9d798e81f WHIRLPOOL 79a27e8af6472f4ab5a604e42a25e80aa957dbdee91478bc228df9d5fe45864cc468a3f3aadc0883d025fa804c16fd3e2ca836ea113ad6373b73114141ea153f
diff --git a/app-misc/crunch/crunch-3.4.ebuild b/app-misc/crunch/crunch-3.4.ebuild
deleted file mode 100644
index b702344d89e0..000000000000
--- a/app-misc/crunch/crunch-3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A wordlist generator"
-HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
-SRC_URI="mirror://sourceforge/crunch-wordlist/crunch-wordlist/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-
-src_prepare() {
- tc-export CC
- epatch "${FILESDIR}/${P}-gentoo.patch"
- epatch_user
-}
-
-src_install(){
- dobin crunch
- doman crunch.1
- insinto /usr/share/crunch
- doins charset.lst
-}
diff --git a/app-misc/crunch/crunch-3.5.ebuild b/app-misc/crunch/crunch-3.5.ebuild
deleted file mode 100644
index 7488fad701ea..000000000000
--- a/app-misc/crunch/crunch-3.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A wordlist generator"
-HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
-SRC_URI="mirror://sourceforge/crunch-wordlist/crunch-wordlist/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-
-src_prepare() {
- epatch_user
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install(){
- dobin crunch
- doman crunch.1
- insinto /usr/share/crunch
- doins charset.lst
-}
diff --git a/app-misc/crunch/files/crunch-3.4-gentoo.patch b/app-misc/crunch/files/crunch-3.4-gentoo.patch
deleted file mode 100644
index acdc757ef61d..000000000000
--- a/app-misc/crunch/files/crunch-3.4-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig 2013-11-21 11:53:21.835712927 +0400
-+++ Makefile 2013-11-21 11:53:42.557713372 +0400
-@@ -16,19 +16,19 @@
- # General variables
- PACKAGE = crunch
- VERSION = 3.4
--PREFIX = /usr
-+PREFIX ?= /usr
- DISTDIR = $(PACKAGE)-$(VERSION)
- DISTFILES = crunch.c crunch.1 charset.lst
- BINDIR = $(PREFIX)/bin
- BTBINDIR = /pentest/passwords/$(PACKAGE)
- MANDIR = $(PREFIX)/share/man/man1
- INSTALL = $(shell which install)
--CC = $(shell which gcc)
-+CC ?= $(shell which gcc)
- LIBFLAGS = -lm
- THREADFLAGS = -pthread
- OPTFLAGS = -g -o0
- LINTFLAGS = -Wall -pedantic
--CFLAGS = $(THREADFLAGS) $(LINTFLAGS) -std=c99
-+CFLAGS += $(THREADFLAGS) $(LINTFLAGS) -std=c99
- VCFLAGS = $(THREADFLAGS) $(LINTFLAGS) -std=c99 $(OPTFLAGS)
- LFS = $(shell getconf POSIX_V6_ILP32_OFFBIG_CFLAGS)
- INSTALL_OPTIONS = -o root -g root
-@@ -46,7 +46,7 @@
-
- crunch: crunch.c
- @echo "Building binary..."
-- $(CC) $(CFLAGS) $(LFS) $? $(LIBFLAGS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(LFS) $? $(LIBFLAGS) -o $@
- @echo ""
-
- # Clean target
diff --git a/app-misc/empty/Manifest b/app-misc/empty/Manifest
index 538ed796570f..40068cd152bf 100644
--- a/app-misc/empty/Manifest
+++ b/app-misc/empty/Manifest
@@ -1,2 +1 @@
-DIST empty-0.6.19b.tgz 16075 SHA256 05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a SHA512 7afb2b5d08f2d3ebe0819eccef39b2e35fa532b6cbdcef49d2dbb4a5aa57fe55b1765461de9691d6eaa3188a9ecd98c291de738c13c9c2158c4f53d704b83670 WHIRLPOOL ed003801da923de6b50e6b29313b5603c18b98851e7523971b7a1059c9d14bc9545726437c6c8c41427fe7fbac531469aa7500ffb324f3cd77682208da88088b
DIST empty-0.6.20b.tgz 16269 SHA256 7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09 SHA512 bdeda29ecde0bc7ee0432656f0497154e04dbad26aba62a0fe76ded394ddeefe2bfd921594a2dae44459b62ab4767d3b12a7a86216dfda56b6d77035a8b05c3d WHIRLPOOL d8004ed6b88a95e3f37416f40da0936cfb082f416ac0ac7c34e052767802faac0f9ad94e1e5e922c3cbdbe9affd0192232a4dccc04aed8bb34234932184ab76e
diff --git a/app-misc/empty/empty-0.6.19b.ebuild b/app-misc/empty/empty-0.6.19b.ebuild
deleted file mode 100644
index e60f8bb241ec..000000000000
--- a/app-misc/empty/empty-0.6.19b.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Small shell utility, similar to expect(1)"
-HOMEPAGE="http://empty.sourceforge.net"
-SRC_URI="mirror://sourceforge/empty/${P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="examples"
-DEPEND=""
-RDEPEND="virtual/logger"
-
-src_prepare() {
- epatch "${FILESDIR}/overflow-fixes.patch"
- epatch "${FILESDIR}/${PN}-respect-LDFLAGS.patch"
-}
-
-src_compile() {
- emake CC=$(tc-getCC)
-}
-
-src_install() {
- dobin empty
- doman empty.1
- dodoc README
- use examples && dodoc -r examples
-}
diff --git a/app-misc/empty/files/overflow-fixes.patch b/app-misc/empty/files/overflow-fixes.patch
deleted file mode 100644
index 96dd18024a03..000000000000
--- a/app-misc/empty/files/overflow-fixes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- empty.c.orig 2009-07-27 18:26:42.000000000 +0100
-+++ empty.c 2011-12-22 17:17:11.037090159 +0000
-@@ -584,7 +584,7 @@
-
- for (i = 1; i < argc; i++) {
- strncat(buf, " ", 1);
-- strncat(buf, argv[i], sizeof(buf));
-+ strncat(buf, argv[i], sizeof(buf) -1);
- }
-
- (void)syslog(LOG_NOTICE, "forked %s", buf);
-@@ -686,7 +686,7 @@
- while ((dent = readdir(dir)) != NULL) {
- if (!strncmp(fmask, dent->d_name, len)) {
- strncpy(fname, dent->d_name, sizeof(fname) - 1);
-- fname[sizeof(buf) - 1] = '\0';
-+ fname[MAXPATHLEN - 1] = '\0';
-
- strtok(fname, sep); /* empty */
- strtok(NULL, sep); /* PPID */
diff --git a/app-shells/ccsh/ccsh-0.0.4-r3.ebuild b/app-shells/ccsh/ccsh-0.0.4-r3.ebuild
deleted file mode 100644
index 2e9325d227c0..000000000000
--- a/app-shells/ccsh/ccsh-0.0.4-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="UNIX Shell for people already familiar with the C language"
-HOMEPAGE="http://ccsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccsh/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~ppc64"
-IUSE=""
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
- exeinto /bin
- doexe ccsh
- newman ccsh.man ccsh.1
- dodoc ChangeLog README TODO
-}
diff --git a/app-shells/ccsh/ccsh-0.0.4-r4.ebuild b/app-shells/ccsh/ccsh-0.0.4-r4.ebuild
index 83aae155314d..aa40d26b0182 100644
--- a/app-shells/ccsh/ccsh-0.0.4-r4.ebuild
+++ b/app-shells/ccsh/ccsh-0.0.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ccsh/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
IUSE=""
src_compile() {
diff --git a/app-text/fbless/Manifest b/app-text/fbless/Manifest
index f6a7d9ac99dc..d1adfcac8ec2 100644
--- a/app-text/fbless/Manifest
+++ b/app-text/fbless/Manifest
@@ -1,2 +1 @@
-DIST fbless-0.2.2.tar.gz 101438 SHA256 0b5e98293e311df52220b5bb2ab74f3fda9e6776e84d963cb18bc6e622e1793b SHA512 93c20d7d2a53790319443c4cb5383ca4b7dbe1c31755ab0bcce748f02a7786ce728629164120aecd1b8cfb36cb082a28d119c882656d54649bbfdfaa0a4e4959 WHIRLPOOL 6c6c7ee572a9bac0d0301e41c336e13f1ef1403591995235aa955254b1f6d08ef2ca5952367e1fb80cf50f3b8caff15b8a49b73e3cec3f6a6885b324498b0790
DIST fbless-0.2.3.tar.gz 115622 SHA256 68ae914d141da913ed6ff1805a1739346c33756b64a9407c14e95e278452c362 SHA512 b5188b0b4c0654915487a49930987c02a3e9bc3ba47a830f744362b464235a502fb28e20bb8c91cea15a5bdbeea54775697bf57ca581f5ebbadb84134dfdbafd WHIRLPOOL 7cb37452dd320689a33edb3e59a97cf8936dfb1578f6ee60c11da579b1f054767f2335969eb5e6eb3b84e243e41c681f02aaf43b8e750bdefab85427d4b19b1d
diff --git a/app-text/fbless/fbless-0.2.2-r1.ebuild b/app-text/fbless/fbless-0.2.2-r1.ebuild
deleted file mode 100644
index 0d00670f466a..000000000000
--- a/app-text/fbless/fbless-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,xml"
-inherit distutils-r1
-
-DESCRIPTION="Python-based console fb2 reader with less-like interface"
-HOMEPAGE="https://github.com/matimatik/fbless"
-SRC_URI="mirror://github/matimatik/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-text/fbless/fbless-9999.ebuild b/app-text/fbless/fbless-9999.ebuild
deleted file mode 100644
index bdf9d5b706f5..000000000000
--- a/app-text/fbless/fbless-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://github.com/matimatik/fbless.git"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,xml"
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Python-based console fb2 reader with less-like interface"
-HOMEPAGE="https://github.com/matimatik/fbless"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
diff --git a/app-text/yagf/Manifest b/app-text/yagf/Manifest
index dccb57e30723..03b1f3c3a1ab 100644
--- a/app-text/yagf/Manifest
+++ b/app-text/yagf/Manifest
@@ -1,2 +1 @@
-DIST yagf-0.9.2.tar.gz 258305 SHA256 1099760462c029aa9919ef96809a1b0252d8d735d9d0807ce790f9d3e1e271b8 SHA512 7348b1611654e9478ef915a5c56f729495382e083bf99ad85284a19499027ad380f7781466aa6c21796859623ca3526ce0965f690c784aa2d459a22d201ef98f WHIRLPOOL b91ef8688801951fe780bdb6e005abd3b97ac42ab7f8d0e9b13ab83a7a163caa445d95b6668328ed1336137ca4bfb5391078347f06fd97ca1a3721b7a90db384
-DIST yagf-0.9.3.2.tar.gz 766396 SHA256 32dd2a60ac04f9b08ec06a4e2974fde2fe3af60238b6a1a8de5a0a29b6ead231 SHA512 79fd1f9fe3a6d10e568b46653d6afd8ef050b4dead58aea42f42888461a1a095ff85e0cf577cb641ba13fb4e9be1efadd000688e100675a03f2c91952211b6fc WHIRLPOOL 37d5d777de797a54676933ec4a35668a4a248d6e90f181ab2e414af5e97ab1c8d9297b5ecbe3c99b1db64d536a234e51fada3f0e1a2353119de367632c567961
+DIST yagf-0.9.5.tar.gz 427018 SHA256 c0e9fe4b16d39378319fe37772403104a81c58084aa918e78347f56456ed5ebc SHA512 a0b77e49c11be0ed043d3f44b1c48122cdabf0ae4ae69d84bc01eee0a8b084dae8201234e08816065d449e4d47bd704f282b1cd3b31c3539d201e9f32dfef05c WHIRLPOOL 92a7c6f02aa1bdc567b9599e6a57888a880eeba111c18645f3987f6d350770ef492d8f0394f2b429daabab4843f496819299fb2e9bdca6f6e6d187d4e1facd18
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
index 876e8eb0bb4d..76b22cdda21f 100644
--- a/app-text/yagf/metadata.xml
+++ b/app-text/yagf/metadata.xml
@@ -1,20 +1,7 @@
-
- yaleks@gmail.com
- Aleksandr Yakimov
- Proxied maintainer. Assign bugs to him
-
-
- pinkbyte@gentoo.org
- Sergey Popov
- Proxy maintainer. CC him on bugs
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
With YAGF you can open already scanned image files or obtain new images
diff --git a/app-text/yagf/yagf-0.9.2.ebuild b/app-text/yagf/yagf-0.9.2.ebuild
deleted file mode 100644
index c17046a7749a..000000000000
--- a/app-text/yagf/yagf-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-CMAKE_IN_SOURCE_BUILD=1
-PLOCALES="de lt pl ru uk"
-inherit cmake-utils l10n
-
-DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner cuneiform +tesseract pdf"
-
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-DEPEND=">=dev-qt/qtgui-4.7:4
- app-text/aspell"
-RDEPEND="${DEPEND}
- cuneiform? ( app-text/cuneiform )
- tesseract? ( app-text/tesseract )
- scanner? ( media-gfx/xsane )
- pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )"
-
-DOCS=( AUTHORS ChangeLog DESCRIPTION README )
-
-src_prepare() {
- l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
-
- epatch_user
-}
-
-src_install() {
- remove_translation() {
- rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" || die "remove '${PN}_${1}.qm' file failed"
- }
- cmake-utils_src_install
- l10n_for_each_disabled_locale_do remove_translation
-}
diff --git a/app-text/yagf/yagf-0.9.3.2.ebuild b/app-text/yagf/yagf-0.9.5.ebuild
similarity index 84%
rename from app-text/yagf/yagf-0.9.3.2.ebuild
rename to app-text/yagf/yagf-0.9.5.ebuild
index 3d8fd48c7be5..3ebcae73386e 100644
--- a/app-text/yagf/yagf-0.9.3.2.ebuild
+++ b/app-text/yagf/yagf-0.9.5.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
PLOCALES="fr ru"
inherit cmake-utils l10n multilib
DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
-HOMEPAGE="http://symmetrica.net/cuneiform-linux/yagf-en.html"
-SRC_URI="http://symmetrica.net/cuneiform-linux/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/yagf-ocr/"
+SRC_URI="mirror://sourceforge/project/yagf-ocr/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
DOCS=( AUTHORS ChangeLog DESCRIPTION README )
src_prepare() {
+ # uk translation generation is broken
+ rm src/translations/yagf_uk.ts || die
# respect CFLAGS and fix translations path
sed -i \
-e '/add_definitions(-Wall -g)/d' \
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index 80fe1b0ce5e7..55066b4ba904 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,3 +1,2 @@
-DIST mariadb-galera-10.0.28.tar.gz 63652419 SHA256 cbbbd3067cbd350aad4811c270aeb77119c6f3949b400231b69e765b64610923 SHA512 8c176771f0329a60da298bc2e234778432a39a78253810b7cd91f5c736e9fc1a730227f9b7ab7a245ed4a935f177274c3ce69b253038052006148a6937c5f272 WHIRLPOOL cbef008eb570a142c4ffab090b9a03e6df58ae8d0726d99c124c87a073865ca71354231805a2eaa9c364d0357d84df0fa8d56176d806dbcfdb43a51d0ee7446c
DIST mariadb-galera-10.0.30.tar.gz 63823185 SHA256 d236e12cfd64e79a5bbca3f7b1914829ca6db2f39f330366d0226d8ad8cc998f SHA512 fcc059f13e68aa664c077edeed186980d121fbbcc88b2281dcdb4939e19bc53c089a70f3a051393e69805e3ded41721ea8fe64771d4cf54d29efa75cb07f9e8a WHIRLPOOL a4dab62602fab4384ff10804c783e773cde12feff6d296be0c7ae84625d82c980cb3090386b318c0da974290583063522d34dbc67bb63e74371492da1924dc8e
DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.28.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.28.ebuild
deleted file mode 100644
index cbff1c176a76..000000000000
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.28.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-MY_EXTRAS_VER="20160629-1442Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-SERVER_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz"
-MY_SOURCEDIR="${PN%%-galera}-${PV}"
-JAVA_PKG_OPT_USE="jdbc"
-
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
-
-IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~amd64 ~x86"
-
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
-PATCHES=(
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch"
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch"
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch"
- "${MY_PATCH_DIR}/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch"
-)
-COMMON_DEPEND="
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- tokudb? ( app-arch/snappy )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- mysql-multilib-r1_pkg_setup
-}
-
-pkg_preinst() {
- java-pkg-opt-2_pkg_preinst
- mysql-multilib-r1_pkg_preinst
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- mysql-multilib-r1_src_prepare
-}
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DWITHOUT_FEDERATED=1
- -DWITHOUT_FEDERATEDX=1 )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- $(mysql-cmake_use_plugin oqgraph OQGRAPH)
- $(mysql-cmake_use_plugin sphinx SPHINX)
- $(mysql-cmake_use_plugin tokudb TOKUDB)
- $(mysql-cmake_use_plugin pam AUTH_PAM)
- -DWITHOUT_CASSANDRA=0
- $(mysql-cmake_use_plugin extraengine SEQUENCE)
- $(mysql-cmake_use_plugin extraengine SPIDER)
- $(mysql-cmake_use_plugin extraengine CONNECT)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DCONNECT_WITH_JDBC=$(usex jdbc)
- -DWITHOUT_MROONGA=1
- )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if ! use server ; then
- einfo "Skipping server tests due to minimal build."
- fi
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
- retstatus_tests=$?
-
- popd || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- local failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-}
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.30.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.30.ebuild
index 0042d4e3f207..61a1c209dde8 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.30.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.30.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication"
IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
+REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~amd64 ~x86"
diff --git a/dev-db/mariadb/mariadb-10.0.29.ebuild b/dev-db/mariadb/mariadb-10.0.29.ebuild
index a28ac0f9bc6c..091fe95c3d59 100644
--- a/dev-db/mariadb/mariadb-10.0.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.29.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/mariadb/mariadb-10.0.30.ebuild b/dev-db/mariadb/mariadb-10.0.30.ebuild
index 1241f92c7230..a0218bb32389 100644
--- a/dev-db/mariadb/mariadb-10.0.30.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.30.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/mariadb/mariadb-10.0.31.ebuild b/dev-db/mariadb/mariadb-10.0.31.ebuild
index 32d354269d38..f6f70d9bf5e8 100644
--- a/dev-db/mariadb/mariadb-10.0.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.31.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/mariadb/mariadb-10.1.24.ebuild b/dev-db/mariadb/mariadb-10.1.24.ebuild
index c2af25accb67..e11a76b62026 100644
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/mariadb/mariadb-10.1.25.ebuild b/dev-db/mariadb/mariadb-10.1.25.ebuild
index fe7121af1dc8..9bdb5a8887f3 100644
--- a/dev-db/mariadb/mariadb-10.1.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.25.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
index b80aa96803dd..8209119b1a59 100644
--- a/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.1_alpha.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL"
IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
RESTRICT="!bindist? ( bindist )"
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"
+REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
diff --git a/dev-db/percona-server/percona-server-5.6.35.80.0.ebuild b/dev-db/percona-server/percona-server-5.6.35.80.0.ebuild
index 246e89f61912..d80fa4c68804 100644
--- a/dev-db/percona-server/percona-server-5.6.35.80.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.35.80.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
RDEPEND="${COMMON_DEPEND}"
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/percona-server/percona-server-5.6.35.81.0.ebuild b/dev-db/percona-server/percona-server-5.6.35.81.0.ebuild
index 246e89f61912..d80fa4c68804 100644
--- a/dev-db/percona-server/percona-server-5.6.35.81.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.35.81.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
RDEPEND="${COMMON_DEPEND}"
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/percona-server/percona-server-5.6.36.82.0.ebuild b/dev-db/percona-server/percona-server-5.6.36.82.0.ebuild
index 246e89f61912..d80fa4c68804 100644
--- a/dev-db/percona-server/percona-server-5.6.36.82.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.36.82.0.ebuild
@@ -28,7 +28,7 @@ DEPEND="${COMMON_DEPEND}
test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
RDEPEND="${COMMON_DEPEND}"
-REQUIRED_USE="tokudb? ( jemalloc ) tokudb-backup-plugin? ( tokudb )"
+REQUIRED_USE="tokudb-backup-plugin? ( tokudb ) tokudb? ( jemalloc !tcmalloc )"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-java/commons-compress/commons-compress-1.10.ebuild b/dev-java/commons-compress/commons-compress-1.10.ebuild
index 16bb6d93d8e1..5670329df835 100644
--- a/dev-java/commons-compress/commons-compress-1.10.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ DESCRIPTION="Java API for working with archive files"
HOMEPAGE="https://commons.apache.org/proper/commons-compress/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
CDEPEND="dev-java/xz-java:0"
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 8bbedd3024a2..a300a552a885 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index 7d5d118f82c1..7845550b508d 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/lang/"
SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
SLOT="2.1"
IUSE=""
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
index 0d12ebdc9a79..fd69eced5bcd 100644
--- a/dev-java/jackcess/jackcess-1.2.14.3.ebuild
+++ b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
CP_DEPEND=">=dev-java/commons-lang-2.6:2.1
>=dev-java/commons-logging-1.1.3:0
diff --git a/dev-java/javacc/javacc-5.0-r2.ebuild b/dev-java/javacc/javacc-5.0-r2.ebuild
deleted file mode 100644
index 265212b1115d..000000000000
--- a/dev-java/javacc/javacc-5.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
-HOMEPAGE="https://javacc.java.net/"
-SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-java/junit:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0-javadoc.patch
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_GENTOO_CLASSPATH="junit"
-
-java_prepare() {
- epatch "${PATCHES[@]}"
- rm -v lib/junit*/*.jar || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "bin/lib/${PN}.jar"
-
- dodoc README
-
- if use doc; then
- java-pkg_dohtml -r www/*
- java-pkg_dojavadoc doc/api
- fi
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/*
-
- echo "JAVACC_HOME=${EPREFIX}/usr/share/javacc/" > "${T}"/22javacc
- doenvd "${T}"/22javacc
-
- echo "export VERSION=${PV}" > "${T}"/pre
-
- local launcher
- for launcher in javacc jjdoc jjtree
- do
- java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
- done
-}
diff --git a/dev-java/javacc/javacc-5.0-r3.ebuild b/dev-java/javacc/javacc-5.0-r3.ebuild
index 14f043b88ac6..1249b0be132f 100644
--- a/dev-java/javacc/javacc-5.0-r3.ebuild
+++ b/dev-java/javacc/javacc-5.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
CDEPEND="dev-java/junit:0"
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
index 76d3dddb4aeb..c5807844d596 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
COMMON_DEP="
dev-java/jffi:1.2
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
index 667c90622e64..8bb9e68cb34c 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
COMMON_DEP="
dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
index 238c884de4d3..d42fb953dfb4 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
SLOT="3.0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
CDEPEND="dev-java/jnr-constants:0
dev-java/jnr-ffi:2"
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index f422e9568de7..f401578160c6 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="http://netty.io/"
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
CDEPEND="dev-java/commons-logging:0
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
index d1a1ef74e9cb..aff11d2b9c04 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="dev-java/commons-io:1
>=dev-java/commons-logging-1:0"
diff --git a/dev-lang/cfortran/cfortran-4.4-r3.ebuild b/dev-lang/cfortran/cfortran-4.4-r3.ebuild
index afef9408e24c..85738d919546 100644
--- a/dev-lang/cfortran/cfortran-4.4-r3.ebuild
+++ b/dev-lang/cfortran/cfortran-4.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="
SLOT="0"
LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="examples"
src_unpack() {
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 4e57d4826054..5739500a38b0 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,12 +1,12 @@
DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
-DIST otp_doc_html_19.2.tar.gz 34761971 SHA256 c373c8c1a9fe7433825088684932f3ded76f53d5b8a4d3d2a364263f1f783043 SHA512 ac9393f3e077be33a4a6e2b50c7848d28298b0f61fbd3b3cc0c650902ebed48d90defcbd6bd3031ac252efa845a6ed94ed781743c04a94c709ae65e5d5957dbb WHIRLPOOL 576ee94e04cf2089a98b949e55443c1b415224a427cf066ff6e7d9871de50c0b21a998ea2346a10c699136d34e5dc1049268e98121f2a4083b4711cf0db3f9b5
DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
+DIST otp_doc_html_20.0.tar.gz 33948386 SHA256 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628 WHIRLPOOL 953bf75da7f6aa46e26e4fb6f12d22834d2a41a43e5449e3bbefbe7359f67b7a0affbb0dd6dbfebdecae9294f080a69c0637741ddcf5dbcd0db488ab5a6ddd1a
DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
-DIST otp_doc_man_19.2.tar.gz 1409661 SHA256 8a76ff3bb40a6d6a1552fa5a4204c8a3c7d99d2ea6f12684f02d038b23ad25cb SHA512 613b50841443fb71e5666a281edbf580b35f28e9fad6a246170017552ee5a04770700b95eae8bcfef3fa2e327a559c43969568091ed8389ecfe3eeea4f67d674 WHIRLPOOL 2d59d572a7f13e8fcb2aed60d5adf44a9d6aa19737b6a0487a1df3e733713306b3b405d4f1e6da4a7ad02df9835eee556d741af4d2baeb261c9a0db5e8596998
DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
+DIST otp_doc_man_20.0.tar.gz 1430939 SHA256 b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99 WHIRLPOOL 16b1c1448cdd3a35b340f66131a41af88e679e2e5e5383f5586f4cd386462f4a306512a068bbac8020209d6f72ef2ac57db07e4075b1d48bd0dcc0b3dfd9657a
DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
-DIST otp_src_19.2.tar.gz 68395949 SHA256 a016b3ef5dac1e532972617b2715ef187ecb616f7cd7ddcfe0f1d502f5d24870 SHA512 6403f2160ea1de9c5b269af47de5d0a0c5714544cdfdbdf366bb20b7b6a60a91b893344ab932b2689021cbd4cedf3dea0de8b390e659eff23b0cc99f36c30f0c WHIRLPOOL 6407ec880ad743b844e1a6b00bf5adcc99b9fe686cff89015a96b5341c58f62aebcc7db547da4e5ad4f680fdc22334d59e20a63f0277d3d60bd8ad72c59ed8c2
DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
+DIST otp_src_20.0.tar.gz 87346046 SHA256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951 WHIRLPOOL df800cc5dd9a79a32ebb14376ced74482cbfd85bb4e6d3af7c7b70f32c7080b1c3dee08d9769fa1e296b248c05e3aebb5a3b486f7f6f6f3e1e36486fd3044b56
diff --git a/dev-lang/erlang/erlang-19.3.ebuild b/dev-lang/erlang/erlang-19.3.ebuild
index 5c3eae678ca9..0e605a39add6 100644
--- a/dev-lang/erlang/erlang-19.3.ebuild
+++ b/dev-lang/erlang/erlang-19.3.ebuild
@@ -18,7 +18,9 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
RDEPEND="
ssl? (
diff --git a/dev-lang/erlang/erlang-19.2.ebuild b/dev-lang/erlang/erlang-20.0.ebuild
similarity index 98%
rename from dev-lang/erlang/erlang-19.2.ebuild
rename to dev-lang/erlang/erlang-20.0.ebuild
index 5c3eae678ca9..0e605a39add6 100644
--- a/dev-lang/erlang/erlang-19.2.ebuild
+++ b/dev-lang/erlang/erlang-20.0.ebuild
@@ -18,7 +18,9 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+
IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
RDEPEND="
ssl? (
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index d84f7d80113f..d4a1337a2e12 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -1,10 +1,7 @@
-
-djc@gentoo.org
-Dirkjan Ochtman
-
+
-
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
index 88c0499e2e9e..09cf9812c829 100644
--- a/gnustep-apps/gorm/Manifest
+++ b/gnustep-apps/gorm/Manifest
@@ -1,5 +1 @@
-DIST gorm-1.2.16.tar.gz 820986 SHA256 81461eece7410cd2d1f7f90faf8c9bc1be149ef7acbfbcc6a7a5ed1f54c07430 SHA512 ea7831fbb45043d914d2c16b93e3a2257f82adb1c8f254ebfa40f4ff08f66ef61691eda891a522d006e80642f0494c2e810e5a3fe01847b97c080745edcd80fd WHIRLPOOL 9751bb5e6cbcc20a4ff9775eaf8906b9739f87f209ff669f4323ba2e88aae17ee57357c3800bbd07dc5a6d2ab47524217762860f2e3a641a858033b93a9166df
-DIST gorm-1.2.18.tar.gz 684967 SHA256 38371d32c0dece862acdf94eb1ce3735eaffc35c3bf16c762b985a6f75ddffee SHA512 3187cf65a92681bec9964efc96d1023ab8b366244159a9de5e491437117d6336fd86247c60c1a2840f73ba32be93f48cc0a600260b60769d4ccd51953b3ed455 WHIRLPOOL aa8cdc3ebfe3c69b7969448cc8d21547f593817953c96e2772463e885f3316b6c1e90a91789bc14e02dba14633850389575b9c7c19d1f9c89694be6b5f743238
-DIST gorm-1.2.20.tar.gz 691424 SHA256 1428bee51999e1915017a1d283a6ad73a94cabdddb7a0d5ad0e9f79bec92d6c0 SHA512 6e5f8be10921c91728d51e5d96a46a794c23510fd69fe3f099f59d32442668011bc037113c27a8e571626c606f1892c0813479195f57bdf6966e1fa8f8b4e217 WHIRLPOOL 8da1beafd99408029884a84153290bbbf2d3509b0b07ec3dc54d30cac5182db11925ebe5b4fd5362e278714f93ec90d3c165f90c3b8d855e2a37e500928e688f
-DIST gorm-1.2.22.tar.gz 695453 SHA256 b15aca762a41a233535cdcadf3e0ce8cfcfbb48c31857eef246ca5d68bb105d7 SHA512 b33e9725383bb3919c40c67a290d5de639abadf71e09ecc77a2ed38923925f2641d14fdb3f30e2a602d4bc2eb1868edc0a38f086b35d655cf7dce42f19e37b6e WHIRLPOOL 16196fc2f5383fed3bfbc75a69eb2d94122a33c4512f45cd6429c45faec3c1c46444df236b1782df663f323d4c37b2efd5c21171d023d432b0b8d7c482c2cc8a
DIST gorm-1.2.23.tar.gz 695799 SHA256 cbd25abbbc85d81d50111be75da14aabce368337694948c95b68b6fdf74eeea2 SHA512 785ba83a82cee982c688a185300e90c9973b1c3de262770e708199593e7d8bfd9dccfa48ff6951f5d87558dffdda67c70fbc5091504afdd93e6e043d7b134460 WHIRLPOOL 6f1a8758d85192efb11e224b2f0ee49822ccc99542fae3a98b828665936cb7a9edea0c4db402b49c03d2873213e4a01282aa58a70029607c05b6e2e6c5ea30e3
diff --git a/gnustep-apps/gorm/gorm-1.2.16.ebuild b/gnustep-apps/gorm/gorm-1.2.16.ebuild
deleted file mode 100644
index f59c97c6231f..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.16.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.18.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- Documentation/GNUmakefile
-}
diff --git a/gnustep-apps/gorm/gorm-1.2.18.ebuild b/gnustep-apps/gorm/gorm-1.2.18.ebuild
deleted file mode 100644
index f59c97c6231f..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.18.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- Documentation/GNUmakefile
-}
diff --git a/gnustep-apps/gorm/gorm-1.2.20.ebuild b/gnustep-apps/gorm/gorm-1.2.20.ebuild
deleted file mode 100644
index 31b4beac65e7..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.20.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- Documentation/GNUmakefile
-}
diff --git a/gnustep-apps/gorm/gorm-1.2.22.ebuild b/gnustep-apps/gorm/gorm-1.2.22.ebuild
deleted file mode 100644
index 5828652e165d..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.22.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- -e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
- Documentation/GNUmakefile
-}
diff --git a/gnustep-apps/graphos/Manifest b/gnustep-apps/graphos/Manifest
index 097057ab50fb..8a2b1339270b 100644
--- a/gnustep-apps/graphos/Manifest
+++ b/gnustep-apps/graphos/Manifest
@@ -1,2 +1 @@
-DIST Graphos-0.5.tar.gz 169743 SHA256 0195dd6481fd60d24dd95ea15c89683b8db6130b57681a6042c5cc9b4a482c08 SHA512 aa5fa08ef0024d3308ef4d58836bd4f432070145dbc304877f41d16637cb04b7a04ba38c9d0e46b28903e798697915d38c838197e57fae0bc26af5e29ad9b0a8 WHIRLPOOL afa047946095958fedff41ee0aa232b3ad4c4b8df8dc4be7eb7c31e6bada42890f84f91120c7ae2cb60286e9e01256885f474264fb4ea3fc99ee00cae150175f
DIST Graphos-0.6.tar.gz 140416 SHA256 c400814806a84c0e8b33bfa6c2010f4b543bf069b2a6d3bcb893ecac2b0f6b7b SHA512 2bf108ef1fb7ff4d2bf3c1a11766704a35986bd629f879f417eaff4b214f8dd50b2319f8f6739a2f589a8eaf8ac334a55365868d0bb001adcbc0bf1ecf30c2b9 WHIRLPOOL 2d43cd111e4a37ee51c2cc33843a6a2d7bed41a52726ff10eecd382aea4e59bd7b622fed3353c2208f24d28fa28b229892f691fce891621db30d3b7df815074e
diff --git a/gnustep-apps/graphos/graphos-0.5.ebuild b/gnustep-apps/graphos/graphos-0.5.ebuild
deleted file mode 100644
index fd2ac512b282..000000000000
--- a/gnustep-apps/graphos/graphos-0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-MY_P=${PN/g/G}-${PV}
-DESCRIPTION="vector drawing application centered around bezier paths"
-HOMEPAGE="http://gap.nongnu.org/graphos/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/gspdf/Manifest b/gnustep-apps/gspdf/Manifest
index 87382f0a6bc0..ee74afe49779 100644
--- a/gnustep-apps/gspdf/Manifest
+++ b/gnustep-apps/gspdf/Manifest
@@ -1,2 +1 @@
-DIST GSPdf-0.4.tar.gz 42251 SHA256 22b84a573c5ef9f7409dbc834d37e1052675b09ff90127584ebca3fee560a8d6 SHA512 a4f5bf112d8c35c276548c563795a08bd52d75aee98163eb0090a0bee624ba12905dc423fb6f9ce148a59edefa48a0836a10171553dae7b67477c740d5346c2d WHIRLPOOL 21011ae6c21c6e9f2424008ec9927eada5c5b3de816288f16c2eb6d1fdd49abfea10dd7008dabe65dee7d2409d30fb58b5e260a01d2629420ceeb1625470d258
DIST GSPdf-0.5.tar.gz 44357 SHA256 b85e2184e90a46aa054d1bf6577fb19f0c3bd953f0e4ff1b8656528d0dfcf88b SHA512 ad173c0301bb3d6395e52f911b4657ad8c69e989366035a50c05705c08dc5afd1561c4acfd1a0fea53b2a02842261351407c479919332c65545bde6a10744041 WHIRLPOOL 0379aa66c7f2738c731b7c7a70745b9386202f6f778adbaafd52e0fd1a42b1491f2b37993c75bf6d14dde09f8358bf6d64fc1ab0ad3a7aed122ba507f2b8d53a
diff --git a/gnustep-apps/gspdf/gspdf-0.4.ebuild b/gnustep-apps/gspdf/gspdf-0.4.ebuild
deleted file mode 100644
index d7ef45fc3f2a..000000000000
--- a/gnustep-apps/gspdf/gspdf-0.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils gnustep-2
-
-MY_PN=GSPdf
-DESCRIPTION="Postscript and Pdf Viewer using GhostScript"
-HOMEPAGE="http://gap.nongnu.org/gspdf/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-text/ghostscript-gpl"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index 744f6c2ab88e..ce06d1959e53 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,4 +1 @@
-DIST gworkspace-0.9.1.tar.gz 3791146 SHA256 c8b1b023621aa83bff3f416485e5c9aa4ecebc90933bf97f3702e0dcfe39cd41 SHA512 7f915ff1b527b088bc91cc062f7178362a2e21bdccb796cad2a76caeb853b56470eb34336a2db6b9adb47977d2fd8a6da9335e8d8a86f15759713772420f43db WHIRLPOOL 69a0f03648d416fa0d4233ac7592291dcbdc111cca68598474e1efab0121a78f3c66453a3b101b2292e43d44f75c9bb1eeb3ef56cea1e0685c840f0558612c37
-DIST gworkspace-0.9.2.tar.gz 4289262 SHA256 5239ef983fd4358e152fcfb5cd1f6c30366d04357c26c74719eb05da849af4fb SHA512 d81476697f83b214c6bed95aa606a8d8fed850dd47ca87d94c151bdb8581d40fde8efa6574f316a6b46c3f2cae3821b9891e984f6d27fc1a155d5c37bd442571 WHIRLPOOL 997eaff5a35dc42f1cce8a1019d1856ce961481698f7e4453655a591e5802ad4bc971968a8c21127b46262eb6d06082afb6f18e4e9c4ef5be4b5c2f3c6bda46c
-DIST gworkspace-0.9.3.tar.gz 3833838 SHA256 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049 SHA512 9a7201252714ebc6a417036cd03f67346d0af7a3b4efbd0b2a7487cc6959b508d152c7a1bac00d4fd7efeb156707512065bdf1891961f96288c13ca5336468e6 WHIRLPOOL 87c937caab0451436440a09859d1f642a50cc2b3ffb0b0bf12da45391046217d4c84c9be827f6addd1bdd1046c18da453315e606421ef66b5e13e09d30c22a50
DIST gworkspace-0.9.4.tar.gz 3855909 SHA256 f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7 WHIRLPOOL cf11a748cbe7efe3c5810accdcc441c20fc4c039ce37c769aeeea4c647302a5b32227ec70993c7bddf1b33c57b98b33441f0da7da41c7c06384078a92e3ff1ac
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
deleted file mode 100644
index 53bd503e9e46..000000000000
--- a/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GWMetadata/MDFinder/GNUmakefile.preamble.orig 2013-04-04 11:05:53.208502021 +0200
-+++ GWMetadata/MDFinder/GNUmakefile.preamble 2013-04-04 11:05:55.012501940 +0200
-@@ -13,7 +13,7 @@
-
- ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
- ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
--ADDITIONAL_LIB_DIRS += -L../../DBKit/$(GNUSTEP_OBJ_DIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../DBKit/$(GNUSTEP_OBJ_DIR)
-
- # Additional LDFLAGS to pass to the linker
- # ADDITIONAL_LDFLAGS +=
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild
deleted file mode 100644
index 7e05ff6cb675..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-# GWMetadata compilation broken for now
-#DEPEND=">=gnustep-apps/systempreferences-1.0.1_p24791
-# >=dev-db/sqlite-3.2.8"
-#RDEPEND="${DEPEND}"
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
-
- egnustep_env
- econf --disable-gwmetadata ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
deleted file mode 100644
index ccd1ca075573..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND="gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791
- >=dev-db/sqlite-3.2.8 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-rpath-link.patch
-}
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
- use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
- egnustep_env
- econf ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild
deleted file mode 100644
index e083262d93be..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND="gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791
- >=dev-db/sqlite-3.2.8 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local myconf=""
- use kernel_linux && myconf="${myconf} --with-inotify"
- use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
- egnustep_env
- econf ${myconf}
-}
-
-src_install() {
- egnustep_env
- egnustep_install
-
- if use doc;
- then
- dodir /usr/share/doc/${PF}
- cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
- fi
-}
diff --git a/gnustep-apps/pictureframe/Manifest b/gnustep-apps/pictureframe/Manifest
index b6b001cd6c7b..3e12711961e4 100644
--- a/gnustep-apps/pictureframe/Manifest
+++ b/gnustep-apps/pictureframe/Manifest
@@ -1,3 +1 @@
-DIST PictureFrame-1.0.0.tar.gz 323256 SHA256 72544560336bd9b2900133fb563096b622ee08050d1c09b998be3a215ecad7e5 SHA512 6dd0f1c0a84e0da9327fb41104a5459882d5a13ee344345135fd06eeaf4a8ab4e811ab28c29db48c2be0d0d46c2e3e5ec57edd69ccc8aab97d30d72bf26763c7 WHIRLPOOL 7f5bf00b63b458e420946275479b25eb5ab6d6339421386b177852472f1ef7ed2dc11a5de7c0119c2449d97ce7374a651379aa02d60ad8a8c375f5ebe5ad436f
-DIST PictureFrame-1.1.2.tar.gz 343556 SHA256 8f84d9cbeb5ec12201b2b382e7a99ec33cab669bf574562146824a2f5f89ffcf SHA512 d8e625a9beef10d85ef2b90561efe2a3d2a8ed196d5a6c6e0448fa54f315a252a9271afa80e21269b04793d451aa3f4ac8441639698c2f0d7b79128f27bd47c3 WHIRLPOOL b5f1522f0494a4734e9e24039fc3febc0cf23ea6dd9e87ac1d9e6465321c0153d6b4e1bf261e08cc310b2c650a5d155c54729e2c546ec2f4a3f6979104785fff
DIST PictureFrame-1.1.3.tar.gz 343981 SHA256 5fb89e50df5dee611bc15629b1d613f24a3b52b8e655b672d383067497c8ed1e SHA512 117dff1519ea21ea3a1b951cb1f1c03574abff14880056339035f29ebb0683fba921afcb28763a79d4aa8d1c28fd3b61aab385444e5fd80878a3088ef1a651b2 WHIRLPOOL b16bdfb505a4cf46b25e11f396b94ed5a386eea334f63e3ece044c8a052ca27082eb77ba3c65d578ca0b68461fe4b1efa68b6e6cf8db7ead7d37807cb3836b03
diff --git a/gnustep-apps/pictureframe/pictureframe-1.0.0.ebuild b/gnustep-apps/pictureframe/pictureframe-1.0.0.ebuild
deleted file mode 100644
index 1e2c5f343809..000000000000
--- a/gnustep-apps/pictureframe/pictureframe-1.0.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-MY_PN=PictureFrame
-DESCRIPTION="digital picture frame software"
-HOMEPAGE="http://www.nongnu.org/gap/pictureframe/index.html"
-SRC_URI="http://ftp.gnustep.org/pub/gnustep/contrib/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
- gnustep-base_src_install
- dodoc PICTURE_FRAMES README
-}
diff --git a/gnustep-apps/pictureframe/pictureframe-1.1.2.ebuild b/gnustep-apps/pictureframe/pictureframe-1.1.2.ebuild
deleted file mode 100644
index ad0b02c89234..000000000000
--- a/gnustep-apps/pictureframe/pictureframe-1.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-MY_PN=PictureFrame
-DESCRIPTION="digital picture frame software"
-HOMEPAGE="http://www.nongnu.org/gap/pictureframe/index.html"
-SRC_URI="http://ftp.gnustep.org/pub/gnustep/contrib/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
- gnustep-base_src_install
- dodoc PICTURE_FRAMES README
-}
diff --git a/gnustep-apps/preferences/Manifest b/gnustep-apps/preferences/Manifest
index d5991526aecd..ad3829aa50d4 100644
--- a/gnustep-apps/preferences/Manifest
+++ b/gnustep-apps/preferences/Manifest
@@ -1,2 +1 @@
-DIST preferences-1.3.0_pre20061204.tar.gz 230142 SHA256 af60134c5eeb7ed52b7209aacbc93ce64b9526c56a9ca2351c9bd9b872f2dbd7 SHA512 d4112e79360964c4f378841e4355c3719a4ddc9cf4138f4ac4a287f9fb2b0fd8257e4143a31a9748af9b8f50c2ee56f05db3a7a68fbf1882d3c7bf3e5a874b7f WHIRLPOOL 489e32cf03db4b3fb49b51626e706e658885c16013ab2bb1653b57f256d025bf50ce4e77a9ccc701d7599ce7dbddba0b6c23e247a113d7ebf08c50add947761f
DIST preferences-1.3.0_pre20100523.tar.gz 428922 SHA256 f07a9a2c4daa265f4619af38669eb7ddc4d221d601f75faff39bd7f29afd3e68 SHA512 63a901a974f09e2a6b20affe7df630bdc51284f0faae5de17745f2b335d73ef7c7e39bae3cb14fb807962a82bd9e5214abc55c1f9186b85c1a94a12e30d0eb76 WHIRLPOOL 78c44bce16f58ae3809db7a30f54d3031ee4ed11ef94b770b66533e0353281beffb4b46c2eddf41f3eda0c7a833c64767065779b092769967fd18b1299533897
diff --git a/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch b/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
deleted file mode 100644
index 0710c90906c6..000000000000
--- a/gnustep-apps/preferences/files/Preferences-nocreate-extra-dirs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur Preferences.backup/GNUmakefile.preamble Preferences/GNUmakefile.preamble
---- Preferences.backup/GNUmakefile.preamble 2003-08-16 13:19:29.000000000 -0400
-+++ Preferences/GNUmakefile.preamble 2004-06-28 19:51:30.104604048 -0400
-@@ -49,8 +49,8 @@
- GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-
- # Additional directories to be created during installation
--ADDITIONAL_INSTALL_DIRS += \
-- $(GNUSTEP_USER_ROOT)/Library/Preferences \
-- $(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
-- $(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
-- $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-+#ADDITIONAL_INSTALL_DIRS += \
-+# $(GNUSTEP_USER_ROOT)/Library/Preferences
-+# $(GNUSTEP_LOCAL_ROOT)/Library/Preferences
-+# $(GNUSTEP_NETWORK_ROOT)/Library/Preferences
-+# $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-Only in Preferences: GNUmakefile.preamble~
diff --git a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch b/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
deleted file mode 100644
index 3ac6a7c4f248..000000000000
--- a/gnustep-apps/preferences/files/preferences-gnustep-make2.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Naur Preferences.orig/GNUmakefile Preferences/GNUmakefile
---- Preferences.orig/GNUmakefile 2004-06-11 00:38:31.000000000 +0200
-+++ Preferences/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -55,7 +55,7 @@
- export TOP_SRCDIR := $(CURDIR)/../..
- endif
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- #
- # Resource files
-diff -Naur Preferences.orig/GNUmakefile.preamble Preferences/GNUmakefile.preamble
---- Preferences.orig/GNUmakefile.preamble 2007-11-06 15:49:02.000000000 +0100
-+++ Preferences/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -37,7 +37,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- #ADDITIONAL_INSTALL_DIRS += \
-diff -Naur Preferences.orig/Modules/Colors/GNUmakefile Preferences/Modules/Colors/GNUmakefile
---- Preferences.orig/Modules/Colors/GNUmakefile 2006-09-03 19:15:12.000000000 +0200
-+++ Preferences/Modules/Colors/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME= Colors
- BUNDLE_EXTENSION= .prefs
-
--BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
-
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- Colors_LANGUAGES= \
- English
-diff -Naur Preferences.orig/Modules/Colors/GNUmakefile.preamble Preferences/Modules/Colors/GNUmakefile.preamble
---- Preferences.orig/Modules/Colors/GNUmakefile.preamble 2004-06-11 00:33:55.000000000 +0200
-+++ Preferences/Modules/Colors/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile Preferences/Modules/Defaults/GNUmakefile
---- Preferences.orig/Modules/Defaults/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Defaults/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -2,10 +2,10 @@
-
- BUNDLE_NAME= Defaults
- BUNDLE_EXTENSION= .prefs
--BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
-
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- Defaults_LANGUAGES= \
- English
-diff -Naur Preferences.orig/Modules/Defaults/GNUmakefile.preamble Preferences/Modules/Defaults/GNUmakefile.preamble
---- Preferences.orig/Modules/Defaults/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Defaults/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Font/GNUmakefile Preferences/Modules/Font/GNUmakefile
---- Preferences.orig/Modules/Font/GNUmakefile 2005-10-12 02:02:36.000000000 +0200
-+++ Preferences/Modules/Font/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME= Font
- BUNDLE_EXTENSION= .prefs
-
--BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
-
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- Font_LANGUAGES= \
- English \
-diff -Naur Preferences.orig/Modules/Font/GNUmakefile.preamble Preferences/Modules/Font/GNUmakefile.preamble
---- Preferences.orig/Modules/Font/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Font/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile Preferences/Modules/Keyboard/GNUmakefile
---- Preferences.orig/Modules/Keyboard/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Keyboard/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -3,10 +3,10 @@
- BUNDLE_NAME= Keyboard
- BUNDLE_EXTENSION= .prefs
-
--BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
-
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- Keyboard_LANGUAGES= \
- English
-diff -Naur Preferences.orig/Modules/Keyboard/GNUmakefile.preamble Preferences/Modules/Keyboard/GNUmakefile.preamble
---- Preferences.orig/Modules/Keyboard/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Keyboard/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
-diff -Naur Preferences.orig/Modules/Time/GNUmakefile Preferences/Modules/Time/GNUmakefile
---- Preferences.orig/Modules/Time/GNUmakefile 2003-08-16 19:19:29.000000000 +0200
-+++ Preferences/Modules/Time/GNUmakefile 2007-11-06 15:48:49.000000000 +0100
-@@ -2,10 +2,10 @@
-
- BUNDLE_NAME= Time
- BUNDLE_EXTENSION= .prefs
--BUNDLE_INSTALL_DIR= $(GNUSTEP_INSTALLATION_DIR)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
-
- FRAMEWORKS= PrefsModule
--include $(TOP_SRCDIR)/Backbone.make
-+
-
- Time_LANGUAGES= \
- English
-diff -Naur Preferences.orig/Modules/Time/GNUmakefile.preamble Preferences/Modules/Time/GNUmakefile.preamble
---- Preferences.orig/Modules/Time/GNUmakefile.preamble 2003-08-16 19:35:57.000000000 +0200
-+++ Preferences/Modules/Time/GNUmakefile.preamble 2007-11-06 15:48:49.000000000 +0100
-@@ -34,7 +34,7 @@
- #
- # Flags dealing with installing and uninstalling
- #
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
-+
-
- # Additional directories to be created during installation
- ADDITIONAL_INSTALL_DIRS +=
diff --git a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild b/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
deleted file mode 100644
index 0b3c7d7fd814..000000000000
--- a/gnustep-apps/preferences/preferences-1.3.0_pre20061204-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/p/P}
-
-DESCRIPTION="Preferences is the GNUstep program with which you define your own personal user experience"
-HOMEPAGE="http://www.nongnu.org/backbone/apps.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-DEPEND="~gnustep-libs/prefsmodule-1.1.1${PV/*_/_}"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/Preferences-nocreate-extra-dirs.patch
- epatch "${FILESDIR}"/${PN}-gnustep-make2.patch
-}
-
-src_install() {
-# egnustep_env
- dodir ${GNUSTEP_SYSTEM_LIBRARY}/Colors
- gnustep-base_src_install
-}
diff --git a/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild b/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
index 2d2e3a6c9737..25615a813f50 100644
--- a/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
+++ b/gnustep-apps/preferences/preferences-1.3.0_pre20100523.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=3
@@ -6,7 +6,7 @@ inherit gnustep-2
S=${WORKDIR}/${PN/p/P}
-DESCRIPTION="Preferences is the GNUstep program with which you define your own personal user experience"
+DESCRIPTION="GNUstep program to define your own personal user experience"
HOMEPAGE="http://www.nongnu.org/backbone/apps.html"
SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/gnustep-apps/preview/Manifest b/gnustep-apps/preview/Manifest
index 0e752680636d..27457aa1edae 100644
--- a/gnustep-apps/preview/Manifest
+++ b/gnustep-apps/preview/Manifest
@@ -1,2 +1 @@
-DIST Preview-0.8.5.tar.gz 68933 SHA256 ddee5ae39ade5b5820e9af6492fb6b84f7c80e5dac6c026e17ae1f2dd44a62f4 SHA512 da7aeacbe383da5655970eb4d4b115ae456e568040376931f93d96838de3275525f45cbc8a10464964f102f1f6b21c191bbacd8cf05c1e77270fe80ef47b2052 WHIRLPOOL add522c37878e74ad91528a3ac8730d5a65bbbddf8b8996f731e8a426ed82c1fe42087a9bff70287cf687de405f4abd3366d3ffe4bd056952f3ba4e444462fe7
DIST Preview-0.9.tar.gz 77516 SHA256 95b790062ff0d67368299125ab3a4295d80ef5ab2d57e8b85e262deea3508a71 SHA512 cfca47e8024f4db2486c3c9c9334b0f5b74f71e6386b227b417f62df541cddf2e2d77d50c9ffce7287284d1339bedb9c929e6254810f370229b59d325fc332ba WHIRLPOOL cdc7cea717ad2cd66a1dd4ca2a170093f19dac1ebc44df26abfb54fc7be306e95e00231b4cc2a0ef79a0e474b7fde49dc5df0048ee4fddbf9a18c8b027119b4e
diff --git a/gnustep-apps/preview/preview-0.8.5-r1.ebuild b/gnustep-apps/preview/preview-0.8.5-r1.ebuild
deleted file mode 100644
index ebcde50575b8..000000000000
--- a/gnustep-apps/preview/preview-0.8.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/p/P}
-
-DESCRIPTION="Simple image viewer"
-HOMEPAGE="http://home.gna.org/gsimageapps/"
-SRC_URI="http://download.gna.org/gsimageapps/${P/p/P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Fix broken french lproj
- rmdir French.lproj/Preview.gorm
- ln -s ../English.lproj/Preview.gorm French.lproj
-
- # Fix compilation, patch from debian
- epatch "${FILESDIR}"/${P}-compilation-errors.patch
-}
diff --git a/gnustep-apps/projectcenter/Manifest b/gnustep-apps/projectcenter/Manifest
index d785adf63389..6f7911169854 100644
--- a/gnustep-apps/projectcenter/Manifest
+++ b/gnustep-apps/projectcenter/Manifest
@@ -1,2 +1 @@
-DIST ProjectCenter-0.6.1.tar.gz 490466 SHA256 3dc72d29bb40bdea9382266045b419ae3c7d117329ea9e0263cf4553e1794ed2 SHA512 6c858f810c6563a185334e75fe7a3a3c58db51d69751b8d685d28e43bb311d7310c702435ab889eb7e53b6e46b8130bde51009f82c012b9cc7c7a2f74efd280b WHIRLPOOL 4e11e30db29c3de55faafd95bf8c94fae79849204b1430c69107e4e76b76a1c6f89976f4a6d6a934932bd88368c2f71221991768719977b1d3e0c129e37e40b6
DIST ProjectCenter-0.6.2.tar.gz 492409 SHA256 c5104ae18511260f900c6de6cca0bcf39361da1866499102bf2a90e2f05d9473 SHA512 91e6712fa03fcb7b6e8239f64ddf89dabb1b4c54f4799204e8e535c9c6ad430a5e98644e28af5b9727a0b5b57a866b4e0837f09e8aedfac863673508a7c67a78 WHIRLPOOL 930e7405570a70eb564852e68573e847f684a2f64715fe8448fcf0d3b4220f154a9cd947bc0fb2e7a0755f572130d0f83346c3e4cad912b744988491d0846140
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.1.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.1.ebuild
deleted file mode 100644
index 1ecf8c5241c4..000000000000
--- a/gnustep-apps/projectcenter/projectcenter-0.6.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=${P/projectc/ProjectC}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An IDE for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
-SRC_URI="http://ftpmain.gnustep.org/pub/gnustep/dev-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-devel/gdb-6.0"
diff --git a/gnustep-apps/simpleagenda/Manifest b/gnustep-apps/simpleagenda/Manifest
index 485eca9acea9..0bf014a3bbc0 100644
--- a/gnustep-apps/simpleagenda/Manifest
+++ b/gnustep-apps/simpleagenda/Manifest
@@ -1,2 +1 @@
-DIST SimpleAgenda-0.42.2.tar.gz 151513 SHA256 596336cd05fd181ac76535cb3519588b7a9ecf1b5792c94d7541a4324ca0fb64 SHA512 e5d5216b03f7fc1d5699ae3a1723b961ad0bcb4497a420a797d0c14e08f8ab5ee052264d1c031e5d9d26371056367b4a307280cc13082959862959e8f6ec8f4b WHIRLPOOL f90a60a4f1025f66b9aab82184760678492177dc0e8f3a0a4213e5ce7796eeab80e9ceef1bbd0f1ceeda56a0c9daad71e4d496eab92d116c9de382743e09a6fc
DIST SimpleAgenda-0.43.tar.gz 155517 SHA256 b363a3e36e6eaa55a81ac96eb8aa590472d83e6f177640016b917d400d969f14 SHA512 85b67cdfb3db633f818adf923b491ecbc5d3767ed15b90f34adaf13737e4ffc5ad021b7be2021ad2017a7ba0a3c7a1a625c296d9a805b2acb948415a89b0a2b0 WHIRLPOOL 71fb0e70e253e4079db5b4d3c412adf7cd1bba9746190045d2487050e8197880fb03f2cc76fe26d326f021574e4b08e94d2cd7be4d8817c7e3a2e0fe3f1015d2
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
deleted file mode 100644
index d1c7bf5cf1b7..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.42.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/simpleagenda"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus"
-
-DEPEND=">=dev-libs/libical-0.27
- >=virtual/gnustep-back-0.20.0
- dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_configure() {
- egnustep_env
- econf $(use_enable dbus dbuskit)
-}
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 2321d7f07976..8a67c93898a2 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,3 +1 @@
-DIST sogo-3.2.6a.tar.gz 32285592 SHA256 07ba2527dab193c5424bc0dd4a9fb53e266c68936011a7245bf5e81e97366a62 SHA512 9b24ab0111408f18e655a5b5ebfe251fc7b9c21914af1c2f2d23c27a7d2d635a8ec0c0119752c7757d2ed878db018c483a8516911e89f5892c1d8fa878418471 WHIRLPOOL d02f25a4360ceea3ccab8f40b3ec726a4ef7792afb412cf415874727abdce1c828e231058be80b3ec5c970c929a33dc3145b82fac8ec13ffdf8b7a9c7d5bc58a
-DIST sogo-3.2.8.tar.gz 32338801 SHA256 cc974f3e486c1b3897ed27c17cedb46b06580bab18a9a6a022fdebd38316ba3d SHA512 34a964e707879c0b6438fca7e7205f454a6bff080ccfc2bdd0b5bd1ffd2c4fcb6fd381e4f168bb2e716d5083f3bfd9d7887fa31b1cfb216a5810b1ffe7d72ca2 WHIRLPOOL 6c3645f3d25358508538baef2c3aebd7d4744f988745bc9117565ba0d373c010c0894083935ba7469c4199d37bf66623c21566fc0856a100f1397bdc2792d934
DIST sogo-3.2.9.tar.gz 32443733 SHA256 c28591e738c5c57428c63504a52ef527898e7a4c6af444ccfe988ccfb5c4f8b1 SHA512 070b3812d65598364d9204432678ea48705bf7481371e44442a13ad86d219415e24c579ad59212a7631922a527d30e69aeb17711c3abfc01960f663f4e0112a3 WHIRLPOOL bb8dd3053c96acb507a3d620a191ebe6225d157995af4428b66755bf38061226cd4d9537413117477d40c095531ca46040d28c78b97f2aeea520bb4ae318683c
diff --git a/gnustep-apps/sogo/sogo-3.2.6a.ebuild b/gnustep-apps/sogo/sogo-3.2.6a.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.6a.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
- dev-libs/libmemcached
- net-misc/curl
- net-misc/memcached
- >=gnustep-libs/sope-${PV}[ldap]
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- >=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-pkg_setup() {
- enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
- gnustep-base_src_prepare
- sed -e "s/validateArgs$//" -i configure \
- || die "GNUstep.conf sed failed"
-
- default
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- ./configure \
- --disable-strip \
- --prefix=/usr \
- --with-ssl="${ssl_provider}" \
- $(use_enable debug) \
- || die "configure failed"
-}
-
-src_install() {
- gnustep-base_src_install
-
- newconfd "${FILESDIR}"/sogod.confd sogod
- newinitd "${FILESDIR}"/sogod.initd sogod
-
- insinto /etc/logrotate.d
- newins Scripts/logrotate sogo
- newdoc Apache/SOGo.conf SOGo-Apache.conf
-
- insinto /etc/sogo
- doins Scripts/sogo.conf
-
- insinto /etc/cron.d
- newins Scripts/sogo.cron sogo
- keepdir /var/log/sogo
-
- fowners sogo:sogo /var/log/sogo
- fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
- gnustep-base_pkg_postinst
- elog "SOGo documentation is available online at:"
- elog "http://www.sogo.nu/downloads/documentation.html"
- elog
- elog "Apache sample configuration file is available in:"
- elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/sogo/sogo-3.2.8.ebuild b/gnustep-apps/sogo/sogo-3.2.8.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
- dev-libs/libmemcached
- net-misc/curl
- net-misc/memcached
- >=gnustep-libs/sope-${PV}[ldap]
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="${RDEPEND}
- >=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-pkg_setup() {
- enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
- gnustep-base_src_prepare
- sed -e "s/validateArgs$//" -i configure \
- || die "GNUstep.conf sed failed"
-
- default
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- ./configure \
- --disable-strip \
- --prefix=/usr \
- --with-ssl="${ssl_provider}" \
- $(use_enable debug) \
- || die "configure failed"
-}
-
-src_install() {
- gnustep-base_src_install
-
- newconfd "${FILESDIR}"/sogod.confd sogod
- newinitd "${FILESDIR}"/sogod.initd sogod
-
- insinto /etc/logrotate.d
- newins Scripts/logrotate sogo
- newdoc Apache/SOGo.conf SOGo-Apache.conf
-
- insinto /etc/sogo
- doins Scripts/sogo.conf
-
- insinto /etc/cron.d
- newins Scripts/sogo.cron sogo
- keepdir /var/log/sogo
-
- fowners sogo:sogo /var/log/sogo
- fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
- gnustep-base_pkg_postinst
- elog "SOGo documentation is available online at:"
- elog "http://www.sogo.nu/downloads/documentation.html"
- elog
- elog "Apache sample configuration file is available in:"
- elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/systempreferences/Manifest b/gnustep-apps/systempreferences/Manifest
index 4b6cd3b5333a..eb6db7b594b6 100644
--- a/gnustep-apps/systempreferences/Manifest
+++ b/gnustep-apps/systempreferences/Manifest
@@ -1,3 +1 @@
-DIST SystemPreferences-1.0.2.tar.gz 272765 SHA256 e8bc8b928441d21f9a4ed9481ccf69338014a6cb7a330fbd6871da6a3bc5009b SHA512 0bd7a8e1194d3bde3bc5b45a6f275efde76dfb0bf91ed0f68376dc232676188c202237f990e6dafd7eb3c57815e7fdd7de7580ee94fbe916ce87a3ce65d21f7f WHIRLPOOL a74b98c5f5ce3529e699c6f2812d72673400e6405c17ce672c7f1fc835144fd6e724ae37a4e0b57420957af98983123200e2205f96b3b41b6e2e0dfa4716b44a
-DIST SystemPreferences-1.1.0.tar.gz 297479 SHA256 c7dffa3b33949e26c319aa2adbda8e9168e51d2f1a0790d5ec0d609a915ec8e0 SHA512 57ae6a5d4e3ff995adbb65d074bbf2fa89a1e870bb644653d05db2e099edd18e36a976ade25219d6601b83d250a79f13db511ffd2b5e822df769a4feb5d9f8ed WHIRLPOOL 9a5a7df44017c982ab5660f052c3cf7d55103beefb4e75464c4240de4ba39671432e45d9824f8259fe6a7995537b4b084c4c57502aaf35730c8598b6a0c76c91
DIST SystemPreferences-1.2.0.tar.gz 309496 SHA256 690cfd28552c5883fe06a89283f44574f41d937627b41c8435743f07e360e7b9 SHA512 22972ac0e51a19276375786759c2b7445691b2a0db4195a448ff1a68871561400fe1f4e194228e903f28d45416db3a00792b320f2749863300ea9117e7e99fbe WHIRLPOOL ee86228c2eadf2d22075b3c7942f7919a092211f207d653004a2b2b2281156833dd17086e9535610320e22b6e37edb819fcb0178d326f93f5f895a2c9bf76309
diff --git a/gnustep-apps/systempreferences/systempreferences-1.0.2.ebuild b/gnustep-apps/systempreferences/systempreferences-1.0.2.ebuild
deleted file mode 100644
index e4210ceb143e..000000000000
--- a/gnustep-apps/systempreferences/systempreferences-1.0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-MY_P=SystemPreferences-${PV}
-DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
-HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/systempreferences/systempreferences-1.1.0.ebuild b/gnustep-apps/systempreferences/systempreferences-1.1.0.ebuild
deleted file mode 100644
index 4cb4de9b748c..000000000000
--- a/gnustep-apps/systempreferences/systempreferences-1.1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit gnustep-2
-
-MY_P=SystemPreferences-${PV}
-DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
-HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild b/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
index 1a774a00b2a8..7fe54791a5f4 100644
--- a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
+++ b/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index 250e5f3e9221..f33c65b90cfa 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -1,2 +1 @@
-DIST Terminal-0.9.7.tar.gz 99847 SHA256 bfe665b026949925fc25dcbbbba220f38bf09b5512d63fb02a8c3756c763ca47 SHA512 1214d25040ba81d25e20cf9c5aa08f76c3ac8c931d44811a07f21567fea034c5656e5e247a18a48e5d2f42a92ce7be199a3159ab1f1e077c2c5cee285ab80ad2 WHIRLPOOL 4c87b86b033280584355cfb395fb5d6117d794bf81ed0f2366bd58778c3a888c619f0ef1bcff9a75e744a2a8b36e76a870389d4cf3431a572f45218a17a0c655
DIST Terminal-0.9.8.tar.gz 110520 SHA256 488428fcc8c25eb3d0b29419f12f48d1dc893dbf89aa71a80743fba31e18eace SHA512 dc282f52662e0e65553562e6684af7ffab25afb62badee5c22c3b5d03c31a75d172b35706512e98d4fa14d68bd3643e0158c67ff61755deab77741d71bf219c0 WHIRLPOOL 051c345d49110360e9754a9e159b4f230a48ae793f4772a8344273547231fe79c34a95daab6e9d84f35193da8939cb585d86ff693eb2b0c13e8e4202f16f10da
diff --git a/gnustep-apps/terminal/terminal-0.9.7.ebuild b/gnustep-apps/terminal/terminal-0.9.7.ebuild
deleted file mode 100644
index 266f84d03ff6..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="! ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- mysql? ( virtual/libmysqlclient:= )
- postgres? ( dev-db/postgresql:= )
- xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- # Non-standard configure script
- ./configure \
- --disable-strip \
- $(use_enable debug) \
- $(use_enable ldap openldap) \
- $(use_enable mysql) \
- $(use_enable postgres postgresql) \
- $(use_enable xml) \
- --with-ssl="${ssl_provider}" \
- --with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sope/sope-3.2.8.ebuild b/gnustep-libs/sope/sope-3.2.8.ebuild
deleted file mode 100644
index 550358b4884d..000000000000
--- a/gnustep-libs/sope/sope-3.2.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- mysql? ( virtual/libmysqlclient:= )
- postgres? ( dev-db/postgresql:= )
- xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use ssl && use gnutls && use libressl ; then
- ewarn "You have enabled both gnutls and libressl, but only"
- ewarn "one provider can be active. Using gnutls!"
- fi
-}
-
-src_configure() {
- local ssl_provider
- if use ssl ; then
- if use gnutls ; then
- ssl_provider=gnutls
- else
- ssl_provider=ssl
- fi
- else
- ssl_provider=none
- fi
-
- egnustep_env
-
- # Non-standard configure script
- ./configure \
- --disable-strip \
- $(use_enable debug) \
- $(use_enable ldap openldap) \
- $(use_enable mysql) \
- $(use_enable postgres postgresql) \
- $(use_enable xml) \
- --with-ssl="${ssl_provider}" \
- --with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sqlclient/Manifest b/gnustep-libs/sqlclient/Manifest
index ca72fefca77d..4e43f6666a31 100644
--- a/gnustep-libs/sqlclient/Manifest
+++ b/gnustep-libs/sqlclient/Manifest
@@ -1,2 +1 @@
-DIST SQLClient-1.7.0.tar.gz 164218 SHA256 8f9c9491f774fce3bf369e407c8f22091c597baddc1a4b0bfe8ccb251bb79462 SHA512 cf4c9ec3bb60b57f4cc2673353029c77a0994c6912e9b5ee9bdab593b68663bde4a465cae6f39482c34fc0a5acff66ac2059be3644eb8db30a399c754e238809 WHIRLPOOL 153dd519969f437579ae3e24732c20c90fec5e141eddf746e4c55b35e7dadb388e4d0ae07b134ca0549e32f4cf6649d7ed1aa798e43498d57701dec664ae0cd0
DIST SQLClient-1.8.1.tar.gz 148622 SHA256 c6cb9d0033b496b52b698f1f80007b6acd215441683cf1a1c22f67a96198074f SHA512 f0339063bf1f0a9050826440f9d4c116fddf61e62f4a8fd4c694afd079d82b54b306dcdadcd29951bbb3502129de211d166e2958de4d31cd6e78563498f2b50f WHIRLPOOL 2dff10803b231a3d4634a8efb22be7e077c2afc6a679d56ea919c0ff98a4f9aa23c6812406df7e5b2fc811a95cfeb8944845313d69869d73da5db39c9ebb429c
diff --git a/gnustep-libs/sqlclient/sqlclient-1.7.0.ebuild b/gnustep-libs/sqlclient/sqlclient-1.7.0.ebuild
deleted file mode 100644
index d1a98d0bb6f9..000000000000
--- a/gnustep-libs/sqlclient/sqlclient-1.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit java-pkg-opt-2 gnustep-2
-
-MY_P=${P/sqlc/SQLC}
-DESCRIPTION="GNUstep lightweight database abstraction layer"
-HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="java mysql postgres +sqlite"
-
-RDEPEND=">=gnustep-libs/performance-0.3.2
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( java mysql postgres sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- if ! use doc; then
- # Remove doc target
- sed -i -e '/documentation\.make/d' GNUmakefile \
- || die "doc sed failed"
- fi
-}
-
-src_configure() {
- local myconf=""
- use java || myconf="${myconf} --disable-jdbc-bundle"
- use mysql || myconf="${myconf} --disable-mysql-bundle"
- use postgres || myconf="${myconf} --disable-postgres-bundle"
- use sqlite || myconf="${myconf} --disable-sqllite-bundle"
-
- egnustep_env
- econf ${myconf}
-}
diff --git a/kde-apps/khelpcenter/khelpcenter-17.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-17.04.3.ebuild
index 637ecbbefaaa..d14947d083cc 100644
--- a/kde-apps/khelpcenter/khelpcenter-17.04.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-17.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="The KDE Help Center"
HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
DEPEND="
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.36.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.36.0.ebuild
index 61d18c0d6531..47d95581d0d2 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.36.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="nls"
RDEPEND="
diff --git a/kde-frameworks/kcmutils/kcmutils-5.36.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.36.0.ebuild
index a9858afc376a..3bf55741864c 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.36.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework to work with KDE System Settings modules"
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.34.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.34.0.ebuild
deleted file mode 100644
index 49259d0cc582..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.34.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="fam nls"
-
-RDEPEND="
- $(add_qt_dep qtcore 'icu')
- fam? ( virtual/fam )
- != 5.8.0
diff --git a/kde-frameworks/kded/kded-5.36.0.ebuild b/kde-frameworks/kded/kded-5.36.0.ebuild
index 9ae522c473fb..5f1510157c8a 100644
--- a/kde-frameworks/kded/kded-5.36.0.ebuild
+++ b/kde-frameworks/kded/kded-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Central daemon of KDE workspaces"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+man"
RDEPEND="
diff --git a/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild b/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild
index 02f500ad596e..d049eb94ce0a 100644
--- a/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild
+++ b/kde-frameworks/kdelibs/kdelibs-4.14.33.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Libraries needed for programs by KDE"
[[ ${KDE_BUILD_TYPE} != live ]] && \
SRC_URI="mirror://kde/stable/applications/${APPS_VERSION}/src/${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="cpu_flags_x86_3dnow acl altivec +bzip2 +crypt debug doc fam jpeg2k
kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
diff --git a/kde-frameworks/kdesu/kdesu-5.36.0.ebuild b/kde-frameworks/kdesu/kdesu-5.36.0.ebuild
index ed530f1f48dd..bcf4e8b0b47e 100644
--- a/kde-frameworks/kdesu/kdesu-5.36.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework to handle super user actions"
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="X"
RDEPEND="
diff --git a/kde-frameworks/khtml/khtml-5.36.0.ebuild b/kde-frameworks/khtml/khtml-5.36.0.ebuild
index 327ac2935351..6749d4ba0d49 100644
--- a/kde-frameworks/khtml/khtml-5.36.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.36.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="KHTML web rendering engine"
LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="libressl X"
RDEPEND="
diff --git a/kde-frameworks/kinit/kinit-5.36.0.ebuild b/kde-frameworks/kinit/kinit-5.36.0.ebuild
index aa01cfeb8eb3..11c9c5a62c67 100644
--- a/kde-frameworks/kinit/kinit-5.36.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+caps +man"
RDEPEND="
diff --git a/kde-frameworks/kio/kio-5.36.0.ebuild b/kde-frameworks/kio/kio-5.36.0.ebuild
index 5dbad6299c50..5bbe22d834e6 100644
--- a/kde-frameworks/kio/kio-5.36.0.ebuild
+++ b/kde-frameworks/kio/kio-5.36.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Framework providing transparent file and data management"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="acl +handbook kerberos +kwallet X"
COMMON_DEPEND="
diff --git a/kde-frameworks/kparts/kparts-5.36.0.ebuild b/kde-frameworks/kparts/kparts-5.36.0.ebuild
index 34b2cf8cdfc0..66bde191b22d 100644
--- a/kde-frameworks/kparts/kparts-5.36.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework providing elaborate user-interface components"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.36.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.36.0.ebuild
index 98fa589df290..03ae3da8a20d 100644
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.36.0.ebuild
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.36.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="speech"
RDEPEND="
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.36.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.36.0.ebuild
index 5b400fc2f474..5e1cc3ab58bc 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.36.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.36.0.ebuild
@@ -7,7 +7,7 @@ VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
LICENSE="LGPL-2+"
IUSE="attica"
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
index f669f5acda19..87e3debfe4b4 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.34.0.ebuild
@@ -27,8 +27,8 @@ RDEPEND="${COMMON_DEPEND}
"
src_test() {
- # bug: 619984
- local myctestargs=( -j1 )
+ # bug: 625276
+ local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
kde5_src_test
}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.36.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.36.0.ebuild
index d38f296a57e8..9b11c8f8e368 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.36.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.36.0.ebuild
@@ -27,8 +27,8 @@ RDEPEND="${COMMON_DEPEND}
"
src_test() {
- # bug: 619984
- local myctestargs=( -j1 )
+ # bug: 625276
+ local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
kde5_src_test
}
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index a42f10aad6b0..06eed5c683d6 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,2 +1 @@
-DIST krename-4.0.9.tar.bz2 244658 SHA256 baf1f426360824c98ee3134a74fe2c93763ea01c15aea8801d6968d676796d85 SHA512 13805de37b816c8475189a35c08febe8657101fb0a2b2a830c92c86320199eec193f582945b0f516f9ac4b08164b17d8af161cb2e890616b2ccf60ed5228dc42 WHIRLPOOL f0107ec77d96e1b47968d17e812425deb93e17e5585e2f5f10ab01d57f78e24efa43b222486d0d6aa18315057d1a5ce63190b9abea559f5e7f033bff5da5fe9f
DIST krename-4.0.9_p20170610.tar.xz 117888 SHA256 88278f3a3bc68a9acabdf55edb1d2e109adce2d4d78742bde23676f4ee92d760 SHA512 a406650f9c2b9094e21ea5224166b6f621da8cab9720737ded37b92c8fd0942ef10cdedc475a08ab363320719ffb203e3f7e0e72de4e64658fc68ad0600736fa WHIRLPOOL 73e5a162c7319ce16b25a7d55276bb08f438fcc8efeea94abd3297eb6367823b3bf1700663bb6d0d732ce404db4b45340b894e75ad27630c139fe41ab6e55f84
diff --git a/kde-misc/krename/files/krename-4.0.9-desktop-file.patch b/kde-misc/krename/files/krename-4.0.9-desktop-file.patch
deleted file mode 100644
index bb7dbacb3af0..000000000000
--- a/kde-misc/krename/files/krename-4.0.9-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN krename-4.0.9.old/src/krename.desktop krename-4.0.9/src/krename.desktop
---- krename-4.0.9.old/src/krename.desktop 2007-03-18 17:54:10.000000000 +0100
-+++ krename-4.0.9/src/krename.desktop 2014-04-29 18:37:34.171237934 +0200
-@@ -1,8 +1,7 @@
- [Desktop Entry]
- Type=Application
--Exec=krename -caption "%c" %i %m %U
--Icon=krename.png
--MiniIcon=krename.png
-+Exec=krename -caption "%c" %i %U
-+Icon=krename
- DocPath=krename/index.html
- Comment=A batch renamer
- Comment[de]=Ein Batch Umbenenner
diff --git a/kde-misc/krename/files/krename-4.0.9-freetype-include.patch b/kde-misc/krename/files/krename-4.0.9-freetype-include.patch
deleted file mode 100644
index c6c70a584cf9..000000000000
--- a/kde-misc/krename/files/krename-4.0.9-freetype-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur krename-4.0.9_old/src/CMakeLists.txt krename-4.0.9/src/CMakeLists.txt
---- krename-4.0.9_old/src/CMakeLists.txt 2010-09-26 08:50:36.000000000 +0200
-+++ krename-4.0.9/src/CMakeLists.txt 2013-02-24 11:28:04.966613874 +0100
-@@ -18,7 +18,7 @@
- ENDIF(LIBPODOFO_FOUND)
-
- IF(FREETYPE_FOUND)
-- INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} )
-+ INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} )
- ENDIF(FREETYPE_FOUND)
-
- ADD_DEFINITIONS(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS} ${LIBPODOFO_CFLAGS} ${KDE4_DEFINITIONS} )
diff --git a/kde-misc/krename/files/krename-4.0.9-gcc6.patch b/kde-misc/krename/files/krename-4.0.9-gcc6.patch
deleted file mode 100644
index b1687926d0ba..000000000000
--- a/kde-misc/krename/files/krename-4.0.9-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- krename-4.0.9/src/batchrenamer.cpp.orig 2016-05-07 12:50:29.243165528 +0000
-+++ krename-4.0.9/src/batchrenamer.cpp 2016-05-07 12:50:52.543081000 +0000
-@@ -402,7 +402,7 @@
- break;
- case eRenameMode_Link:
- // In case of link delete created file
-- job = KIO::file_delete( dstUrl, false );
-+ job = KIO::file_delete( dstUrl, NULL );
- break;
- case eRenameMode_Copy: // no undo possible
- // TODO: Maybe we should delete the created files
diff --git a/kde-misc/krename/krename-4.0.9-r3.ebuild b/kde-misc/krename/krename-4.0.9-r3.ebuild
deleted file mode 100644
index 1567329e4bc2..000000000000
--- a/kde-misc/krename/krename-4.0.9-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="bs cs de el es fr hu it ja lt nl pl pt ru sl sv tr uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="KRename - a very powerful batch file renamer"
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug exif pdf taglib truetype"
-
-RDEPEND="
- exif? ( >=media-gfx/exiv2-0.13:= )
- pdf? ( >=app-text/podofo-0.8 )
- taglib? ( >=media-libs/taglib-1.5 )
- truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-freetype-include.patch"
- "${FILESDIR}/${P}-desktop-file.patch"
-)
-DOCS=( AUTHORS README TODO )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with taglib)
- $(cmake-utils_use_with pdf LIBPODOFO)
- $(cmake-utils_use_with truetype Freetype)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-misc/krename/krename-4.0.9-r4.ebuild b/kde-misc/krename/krename-4.0.9-r4.ebuild
deleted file mode 100644
index cd80c0d3154f..000000000000
--- a/kde-misc/krename/krename-4.0.9-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_LINGUAS="bs cs de el es fr hu it ja lt nl pl pt ru sl sv tr uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="KRename - a very powerful batch file renamer"
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif pdf taglib truetype"
-
-RDEPEND="
- exif? ( >=media-gfx/exiv2-0.13:= )
- pdf? ( >=app-text/podofo-0.8 )
- taglib? ( >=media-libs/taglib-1.5 )
- truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-freetype-include.patch"
- "${FILESDIR}/${P}-desktop-file.patch"
- "${FILESDIR}/${P}-gcc6.patch"
-)
-DOCS=( AUTHORS README TODO )
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_Exiv2=$(usex exif)
- -DWITH_Taglib=$(usex taglib)
- -DWITH_LIBPODOFO=$(usex pdf)
- -DWITH_Freetype=$(usex truetype)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-misc/krename/krename-4.0.9_p20170610.ebuild b/kde-misc/krename/krename-4.0.9_p20170610.ebuild
index 6de1960b2505..7f23fecc1585 100644
--- a/kde-misc/krename/krename-4.0.9_p20170610.ebuild
+++ b/kde-misc/krename/krename-4.0.9_p20170610.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.krename.net/"
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="exif pdf taglib truetype"
COMMON_DEPEND="
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.3.ebuild
index 2b4051ac45b4..b5687b99ba7b 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.3.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.10.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+kdesu X"
DEPEND="
diff --git a/mail-client/kube/kube-0.3.1.ebuild b/mail-client/kube/kube-0.3.1.ebuild
index 565cb0c1df5a..55f2bbf28bbd 100644
--- a/mail-client/kube/kube-0.3.1.ebuild
+++ b/mail-client/kube/kube-0.3.1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
$(add_qt_dep qtwidgets)
>=app-crypt/gpgme-1.7.1:=[cxx,qt5]
dev-libs/kasync
- dev-libs/sink
+ >=dev-libs/sink-0.3.0
"
DEPEND="${RDEPEND}"
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 3347fb5d2c2e..a2e5110f5858 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
DIST postfix-3.1.2.tar.gz 4337569 SHA256 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b SHA512 58493d1890c3235d74a18365294ca764bd3b3f278b9825da931005165af60250342c6cf477c3b3575e50858d99cd3ee40f22bece094eb61e9be6c3cf0313d571 WHIRLPOOL 37e90ef6275a7f2dc8f712bb05348861098697438f274a5c5b69f50b31d55574af262a658657863c93f77fdeba2d37bf7b30dc43bf1629615f496ede19a89c00
DIST postfix-3.1.6.tar.gz 4341308 SHA256 e5eb005fd133c6a32ca03e796e0192945eb877be8eb727f30d25547c997c5aa6 SHA512 646317393d33fcec99bef7f3dc142a847591927bc034c0c71e578baedad1875040cfeabdaa3436312f60485cb69bbdb31197aa9e7526a457946d7749b781099b WHIRLPOOL 66a087da3b33353a22176b9162fe0679f8ff35e48ae693a3315d52232e662638d48b8827648c0b0368e018161e1ade6a671773c109208ded9659cca26b1b5ea1
DIST postfix-3.2.2.tar.gz 4390318 SHA256 d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576 SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418 WHIRLPOOL 7681299ffb747316f1366350f5fac5cf5f156ed9681a26ec6ed5dca0ab42a6a95f93e943bd6ccaccac259c2f7dd1cd1ba441a8968a8988d59ac2208fdbb2f480
-DIST postfix-3.3-20170613.tar.gz 4391163 SHA256 4c66e3188aa2ff8fdf4f9e9705261204e8128687bc3eb1dd07c7f10af0225cfc SHA512 225abf7ead922411b1519aea7cb5028b0fe2ac93a0189238a9d74127db66b17f008102301c92c6832304501f70dff99fa815f7c0998cf26be4bbbc3c921324f0 WHIRLPOOL 2b169bc56ad60d84dc2440a074816af2784d455de024071792cf52bd4dc037d5750342c067a64fa9c2d01a5f03d8702a1d87d3ca330e20533f8291a3fe3be9ef
+DIST postfix-3.3-20170716.tar.gz 4392228 SHA256 92f8550650bbe89b37c134fd8e56e107c02763d9ecbf9f906368e643859824bb SHA512 b08afd8708bf10385b898399bb600f8c6a17a985fa407bc2860301d034178b427e9193fb364437042160624ff29979b479c4b9d57b14dc86a23dab8b5d8d2aa7 WHIRLPOOL 89a2af47d4d33a0d6742f3ebc78aa8350d35729627e25874255f7d6ce958928941ec4e77ed2271a5056d6128197aff23b503733fa6d3d5b6d2cdbef83a12360c
DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.3_pre20170613.ebuild b/mail-mta/postfix/postfix-3.3_pre20170716.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.3_pre20170613.ebuild
rename to mail-mta/postfix/postfix-3.3_pre20170716.ebuild
diff --git a/media-fonts/terminus-font/terminus-font-4.40.ebuild b/media-fonts/terminus-font/terminus-font-4.40.ebuild
index ae1ae51ba2e0..7bbb2352a855 100644
--- a/media-fonts/terminus-font/terminus-font-4.40.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.40.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
raw-font-data ru-dv +ru-g ru-i ru-k"
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 9334e359e3a7..2f6415bd4696 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1 +1,2 @@
DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
+DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild
index 66d06b959d93..8d6ce9bfd2a2 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -35,7 +35,7 @@ RDEPEND="dev-libs/libltdl:0
media-fonts/urw-fonts
>=media-libs/freetype-2
)
- webp? ( media-libs/libwebp )
+ webp? ( media-libs/libwebp:= )
wmf? ( media-libs/libwmf )
X? (
x11-libs/libSM
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
new file mode 100644
index 000000000000..830e20b7ce5a
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg test threads tiff truetype
+ webp wmf X zlib"
+
+RDEPEND="dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+# corefonts are required because needed arial font (bug #588398).
+DEPEND="${RDEPEND}
+ test? ( media-fonts/corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ "${FILESDIR}"/${PN}-1.3.19-perl.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ econf \
+ --${openmp}-openmp \
+ --enable-largefile \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable debug prof) \
+ $(use_enable debug gcov) \
+ $(use_enable imagemagick magick-compat) \
+ $(use_with threads) \
+ $(use_with modules) \
+ --with-quantum-depth=${depth} \
+ --without-frozenpaths \
+ $(use_with cxx magick-plus-plus) \
+ $(use_with perl) \
+ --with-perl-options=INSTALLDIRS=vendor \
+ $(use_with bzip2 bzlib) \
+ $(use_with postscript dps) \
+ $(use_with fpx) \
+ --without-gslib \
+ $(use_with jbig) \
+ $(use_with webp) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jp2) \
+ $(use_with lcms lcms2) \
+ $(use_with lzma) \
+ $(use_with png) \
+ $(use_with tiff) \
+ $(use_with truetype ttf) \
+ $(use_with wmf) \
+ --with-fontpath="${EPREFIX}"/usr/share/fonts \
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
+ $(use_with svg xml) \
+ $(use_with zlib) \
+ $(use_with X x)
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 59e41e827fd1..85e94649fb91 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,4 +1,5 @@
DIST ImageMagick-6.9.7-4.tar.xz 8797776 SHA256 68842c55ed9c958b84aae17974961cefff4212bf7146f09fd15c09dbdc2d9629 SHA512 9ee9cf01c486575183a67e418bdbdcf4ac2b7ea2f9ff033db6a74f8271af0567da00f020dd8c18e042221d20444bed21d5d5256944ddeaf9916b62bf1844acf6 WHIRLPOOL 7c75006dafd28bb0fe02e130b4fcbae5fe54c6fbfdb29ba6b49796a14354e7aeb56b80c498eb57a4a8c7b383af025406dfeba66735ba89fd35d61125b51e7d41
-DIST ImageMagick-6.9.8-3.tar.xz 8819084 SHA256 5dd5804f803d01f0c0c6fc0f3da68cc8e4c638b5ff56770f8481bbe202411316 SHA512 78d467a3d6f38d9b2f30d9d5154a45396a082e7c31119e37a3646080fbc3a87447e9fd73ffbdcc8cf45e9370bdab963d7e5b674d5933ac6d52e017371d7c1460 WHIRLPOOL 80ad8fe7afd7a564739426d1e8eee8d85900c420a07a1edc7ef047958537c0fbd5674e9f3385cc7448e903b4ebd08c24e21bdf3e0615d42614a740df7abba914
DIST ImageMagick-6.9.8-6.tar.xz 8772452 SHA256 dc587a30457d1b42fa980fe7d94bfad906407ad811335e60f5eb673b3a17afeb SHA512 9bd05db02f0565063d6513620567e54b66521dc49b9dd26a83e68d1aab3ca599b9b34ba0661df2e3a88042b88806db156f6a1e9598c34d76307c0fb4ad0c4271 WHIRLPOOL de126414da7b8bfc99102ad7ff3e3d181bc584561344b29c927f66531ecf797ef5e95100279af7a20372a13be67829565d47c612676089419d413ddfa84fa632
+DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
DIST ImageMagick-7.0.5-7.tar.xz 8261496 SHA256 f72d089074d6c968bab38d1c18b22bd92c876e7ae23f7261db0b7c3552186586 SHA512 b634d4bba00fb3a344af350c29d8ecb397901c05cafece1de136a1d8f95e65a1324b4f035b5ed021d505980e8b373ddd4995805b73ed48a257039aa829e58855 WHIRLPOOL 1ac5e950fdf57e2000fae3c1817725e2ea86f41e6e51661a4cb93a47b83cba9864874d3d3662831fbd66308e2816744d9a7532ebeea1c615e3bad9a879a5f0a9
+DIST ImageMagick-7.0.6-1.tar.xz 8546292 SHA256 7a273e0428a817a240fa0b37d209e41285676189cb9969abdb8b1d7d01d36fc4 SHA512 09c6cf0fa3f7f04dc806ad49e5324e8f051e79032f6d9ef83235c130764c931942ee90d643476c92f36fd49a53d3fd195553b658f2f937b82b4950e57724bcfb WHIRLPOOL 107a11ff2a8671a570ab45768645e3f3af900d35b850cd8b858906515061adfe97d1cb4b7ce570d123de46e0585403b97364ec9f99c0aa16ac5d78568f0892af
diff --git a/media-gfx/imagemagick/imagemagick-6.9.8.3.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
similarity index 92%
rename from media-gfx/imagemagick/imagemagick-6.9.8.3.ebuild
rename to media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
index f89bead81328..29bb1d35600f 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.8.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.0.ebuild
@@ -67,19 +67,28 @@ REQUIRED_USE="corefonts? ( truetype )
S=${WORKDIR}/${MY_P}
src_prepare() {
+ local mesa_cards ati_cards nvidia_cards render_cards
default
elibtoolize # for Darwin modules
# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
if test -n "${mesa_cards}"; then
addpredict "${mesa_cards}"
fi
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
+ nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
fi
shopt -u nullglob
addpredict /dev/nvidiactl
@@ -163,7 +172,7 @@ src_install() {
if use opencl; then
cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card"
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
EOF
insinto /etc/sandbox.d
diff --git a/media-gfx/imagemagick/imagemagick-7.0.6.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.6.1.ebuild
new file mode 100644
index 000000000000..683354b7f955
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.6.1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+ dev-libs/libltdl:0
+ bzip2? ( app-arch/bzip2 )
+ corefonts? ( media-fonts/corefonts )
+ djvu? ( app-text/djvu )
+ fftw? ( sci-libs/fftw:3.0 )
+ fontconfig? ( media-libs/fontconfig )
+ fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+ graphviz? ( media-gfx/graphviz )
+ jbig? ( >=media-libs/jbigkit-2:= )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+ lcms? ( media-libs/lcms:2= )
+ lqr? ( media-libs/liblqr )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr:0= )
+ pango? ( x11-libs/pango )
+ perl? ( >=dev-lang/perl-5.8.8:0= )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/ghostscript-gpl )
+ raw? ( media-gfx/ufraw )
+ svg? ( gnome-base/librsvg )
+ tiff? ( media-libs/tiff:0= )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp:0= )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ )
+ xml? ( dev-libs/libxml2:= )
+ lzma? ( app-arch/xz-utils )
+ zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+ !media-gfx/graphicsmagick[imagemagick]
+ virtual/pkgconfig
+ X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ local ati_cards mesa_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ shopt -s nullglob
+ ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+ if test -n "${ati_cards}"; then
+ addpredict "${ati_cards}"
+ fi
+ mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+ if test -n "${mesa_cards}"; then
+ addpredict "${mesa_cards}"
+ fi
+ nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+ if test -n "${nvidia_cards}"; then
+ addpredict "${nvidia_cards}"
+ fi
+ render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+ if test -n "${render_cards}"; then
+ addpredict "${render_cards}"
+ fi
+ shopt -u nullglob
+ addpredict /dev/nvidiactl
+}
+
+src_configure() {
+ local depth=16
+ use q8 && depth=8
+ use q32 && depth=32
+
+ local openmp=disable
+ use openmp && { tc-has-openmp && openmp=enable; }
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+ CONFIG_SHELL=$(type -P bash) \
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable hdri) \
+ $(use_enable opencl) \
+ --with-threads \
+ --with-modules \
+ --with-quantum-depth=${depth} \
+ $(use_with cxx magick-plus-plus) \
+ $(use_with perl) \
+ --with-perl-options='INSTALLDIRS=vendor' \
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+ $(use_with bzip2 bzlib) \
+ $(use_with X x) \
+ $(use_with zlib) \
+ --without-autotrace \
+ $(use_with postscript dps) \
+ $(use_with djvu) \
+ --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
+ $(use_with fftw) \
+ $(use_with fpx) \
+ $(use_with fontconfig) \
+ $(use_with truetype freetype) \
+ $(use_with postscript gslib) \
+ $(use_with graphviz gvc) \
+ $(use_with jbig) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k openjp2) \
+ $(use_with lcms) \
+ $(use_with lqr) \
+ $(use_with lzma) \
+ $(use_with openexr) \
+ $(use_with pango) \
+ $(use_with png) \
+ $(use_with svg rsvg) \
+ $(use_with tiff) \
+ $(use_with webp) \
+ $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
+ $(use_with wmf) \
+ $(use_with xml) \
+ --${openmp}-openmp \
+ --with-gcc-arch=no-automagic
+}
+
+src_test() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+src_install() {
+ # Ensure documentation installation files and paths with each release!
+ emake \
+ DESTDIR="${D}" \
+ DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+ dodoc {AUTHORS,README}.txt ChangeLog
+
+ if use perl; then
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
new file mode 100644
index 000000000000..12021186569b
--- /dev/null
+++ b/media-radio/wsjtx/Manifest
@@ -0,0 +1 @@
+DIST wsjtx-1.7.0.tgz 21293155 SHA256 e7b3f31dad87b2b9cfb0a39bbba466f7039200541d37bfd181974fd11956a358 SHA512 9d03b7cac598a61967453c97b3e9bcc904378f3a1980537e2b95b48a9daf666eda33c09699269cbd2d135473b41bd485173d514f9bbf957365f986e45606136f WHIRLPOOL 3653d6f7fdbb1cefb7d6363581e3b741d728984bc6e8cb323e1ae51ae4dc1d6afb7a1a7c19f819a3bcae7b6ab88271bcac0896fd5cd42aa7a7d60e18aa7212e9
diff --git a/media-radio/wsjtx/metadata.xml b/media-radio/wsjtx/metadata.xml
new file mode 100644
index 000000000000..95677f990a67
--- /dev/null
+++ b/media-radio/wsjtx/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ tomjbe@gentoo.org
+ Thomas Beierlein
+
+
+ wsjt
+
+
diff --git a/media-radio/wsjtx/wsjtx-1.7.0.ebuild b/media-radio/wsjtx/wsjtx-1.7.0.ebuild
new file mode 100644
index 000000000000..e8f7591ebbf2
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-1.7.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork
+ dev-qt/qtwidgets
+ dev-qt/qtconcurrent
+ dev-qt/qtserialport
+ virtual/libusb:1
+ media-libs/portaudio
+ sci-libs/fftw:3.0[threads]
+ virtual/fortran
+ app-text/asciidoc
+ doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWSJT_GENERATE_DOCS="$(usex doc)"
+ -DWSJT_DOC_DESTINATION="/doc/${PF}"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+ rm "${D}"/usr/share/man/man1/rigctl{,d}-wsjtx.1.gz || die
+ rm "${D}"/usr/share/doc/${PF}/{copyright,changelog.Debian.gz,INSTALL,COPYING} || die
+}
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
new file mode 100644
index 000000000000..f8b66a90e7cd
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
@@ -0,0 +1,31 @@
+Patch taken from:
+https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
+To fix bug report:
+http://www.openwall.com/lists/oss-security/2015/08/29/1
+ https://bugs.gentoo.org/show_bug.cgi?id=559170
+--- oggenc/audio.c
++++ oggenc/audio.c
+@@ -245,8 +245,8 @@
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+ int aifc; /* AIFC or AIFF? */
+- unsigned int len;
+- unsigned char *buffer;
++ unsigned int len,readlen;
++ unsigned char buffer[22];
+ unsigned char buf2[8];
+ aiff_fmt format;
+ aifffile *aiff = malloc(sizeof(aifffile));
+@@ -269,9 +269,9 @@
+ return 0; /* Weird common chunk */
+ }
+
+- buffer = alloca(len);
+-
+- if(fread(buffer,1,len,in) < len)
++ readlen = len < sizeof(buffer) ? len : sizeof(buffer);
++ if(fread(buffer,1,readlen,in) < readlen ||
++ (len > readlen && !seek_forward(in, len-readlen)))
+ {
+ fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
+ return 0;
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..977e7e88ff3f
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+ flac? ( media-libs/flac )
+ kate? ( media-libs/libkate )
+ ogg123? (
+ >=media-libs/libao-1.0.0
+ net-misc/curl
+ )
+ speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-underlinking.patch
+ epatch "${FILESDIR}"/${P}-format-security.patch
+ epatch "${FILESDIR}"/${P}-aiff-buffer-overflow.patch
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_enable ogg123) \
+ $(use_with flac) \
+ $(use_with speex) \
+ $(use_with kate)
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 320adf8a4b58..c7c6f01a90e3 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
-DIST mpv-0.25.0-patches-r1.tar.xz 8408 SHA256 aa027a4df1e8e5d6612102ab3afdfb93019de5ed868f65d38e967bca76ab41ae SHA512 e9344546283c88a489b517d408cbaf49c3aabc380372e28871b63c91d0b99a3946b2c5511d247e48916671081c8f85dd27e38a552b3f96cc6122c179ab10e928 WHIRLPOOL b4a5871478b284052f66d4fb6229e8b2a0453cbbb92e03c6b39cb821be0def58d7047594e7782972cb50d4089adaf6175b5f1f77329aba3c2c36c8167e33d03d
+DIST mpv-0.25.0-patches-r2.tar.xz 11036 SHA256 34440d419e95983f50dc97c323737c19891234478566bdf613ec9db81fb0e0e7 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 WHIRLPOOL 9e1540e8e4b2a2a8e70861dd9eb7f32281549b9c418ea716da697e5de39118b0806998f40958e84d868e00854a4bead929ef9958de0becc120fa5f525b34ccab
DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a
diff --git a/media-video/mpv/mpv-0.25.0-r1.ebuild b/media-video/mpv/mpv-0.25.0-r2.ebuild
similarity index 100%
rename from media-video/mpv/mpv-0.25.0-r1.ebuild
rename to media-video/mpv/mpv-0.25.0-r2.ebuild
diff --git a/media-video/ogmrip/metadata.xml b/media-video/ogmrip/metadata.xml
index 0a3f48bb2e99..8b143a0f2799 100644
--- a/media-video/ogmrip/metadata.xml
+++ b/media-video/ogmrip/metadata.xml
@@ -1,18 +1,10 @@
-
- billl@users.sf.net
- Olivier Rolland
-
media-video@gentoo.org
Gentoo Video project
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-