gentoo resync : 31.10.2017

7 files changed, 57 insertions, 73 deletions

diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index 6302db2a1508..dd08133e8726 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -4,7 +4,7 @@ DIST joe-4.3.tar.gz 1270523 SHA256 985d6a8f943a06e64165996c24d7fecaeae8c59efb529
 DIST joe-4.4.tar.gz 1350062 SHA256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979 SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d WHIRLPOOL a1d1cb7b519b62b4380f5b281ea49f06556fb670f4e77b63af2e8f0265794ca907502d76fcf756620111f115c260c3a72bb54d1dc52eb3b9a04f3392aad5ba7b
 EBUILD joe-4.2.ebuild 1170 SHA256 4814b782714a2ee0e906a702a37b3f3ce1ab31dc2661d9a512a3297ea1a8c5da SHA512 e0b51d75d14eb5bc34fd8628ce36f77cb4154965fe8189fccbb2d5d4a4dc746f6ccee09b13a50347a532619b06f13ec254c0c1fd37caaefa9886ca1e6e8504c9 WHIRLPOOL a34b668acbfc527bc154ad0fe98faaa20f10330734ed736047182f4bd044a8b8cc9728bc3febc118e74efc57a473575599d69155b7f6e1b16151a47fc2f532f2
 EBUILD joe-4.3-r1.ebuild 1303 SHA256 59e58d759bbbd005df71611c32719564422d5546e2c404a8fce0baa768cfe90f SHA512 a93ff4ceea8a3fabca0b5c8ffbe0a610ccb446e6ab77ac161c4b6b4a6d63b6ba72fbc7328e0f3b6973ed8808909de0751499d696a2b2e76c705852086ef73d5a WHIRLPOOL 39432042be62563bdf2d74165d0b75d34f7d6878654a39b62c23988a630d2c4bb13d8a783096af72a4a3c73958cf96b73c0ceb848bde23ea72c9e11031848346
-EBUILD joe-4.4.ebuild 1308 SHA256 d3ae94687f2c8758ad1b37d0ea5e44e559cfbaa26fd2e089e1d6b7bcb1b75c48 SHA512 4ecedb096ab5e52d5acbdeb32441af60b5ec203c0cc591aa2d954daf5c60ee085cbb0f0dea337bbba08b651d64b5e8c7f8a13bd4f6a33dd9fcb49fcb8e3a29c9 WHIRLPOOL 1974ea8dc76b707af228712f9cf86e391efdc2ed10e9b6caea084d1ad533d316f66ccb3911637a91a6b9f07f0d66b9fa673f7c2f783965bbaabde5bf10c75f62
+EBUILD joe-4.4.ebuild 1307 SHA256 3c871e4995f77d9a3c25c9728af69484ab16e0bd3b734cecb58fa9d4f3fea82a SHA512 a437fa8f5cbf7048243f98b92916e302604a19466c8acab4539066d4b3ef3cf67a273e62fd727e82cd0774bffaf22777b11de0e694b09d960b93d416b60b34ab WHIRLPOOL 54aa47ae74e3d1773cb7f5f7f2ad9764e8a31156e5c360619875b477b4179f0e5eec0a9d969f134815b794c98c90ae976926ff2d86c8b9d9815b2264763a00f0
 MISC ChangeLog 5460 SHA256 8b154124514ec58cecec4f83261d59a6d69bed7d32c112049a1eb27c74e75c8c SHA512 c62d6feaf242d630f4c38d5fb2d0bc1438bcf9aa7cd23b09fac29756ee623c6dc5861171fbaf9b23a28896425ebb5ab178eedbededbb3ca32da378fbd989a2fd WHIRLPOOL 584b6764b7275b1f393c72816e760eef1771bcafb45c70ebb94de5c70849f53199f377b19e00c99597236b8e28996f7162843a88d935eea8939fe734386a1e97
 MISC ChangeLog-2015 10842 SHA256 be0f3879bc83f8e2fb6ca9c7e0827d74827929b18d8c21a4c4fd1b40559b806f SHA512 17e8efc2b71a219810237e08f687ffaf810698685180fd38a3e7a4667ca90d97cd5000a346a1ef350a4e4d1034438437af3e644133eca45c4edc90ba39d28a28 WHIRLPOOL 3de0ed2a94ba65462fa2ead3acd6e5735ef18b01c60cf118b38cd36a0e6b552d6d18a97d67fb77df085f3fcc625c5048aa703c812e0b71a319ea8e38f1159705
 MISC metadata.xml 914 SHA256 270873d328134a450720a9f8001f441e02cbda456ca88b3d5917e865fe7ef96c SHA512 12324115a08719acf2377848a9cb930b4ad69764624a1cf093e4ef3e124fef85e059476a0f1b353314a03d97089fe0c518adf47f2da102f7492a1e612c420b15 WHIRLPOOL 0db68c8ca2f849e6020b8ed82c70f6d6e1f8bde0570dbd78f5faea25820e28d3c995f23dd04bce2ccc48e93e6393987b2d180ed3269af7e36c1edc6046c7eed5
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
index 478c633912c8..4531e3ad9f0e 100644
--- a/app-editors/joe/joe-4.4.ebuild
+++ b/app-editors/joe/joe-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index f6bf827942be..c6f149e6afd0 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,9 +1,6 @@
-AUX 0.10-link-libjuff-against-libenca.patch 635 SHA256 03e5b96563193956ad860915e29f48e3c8fbafbd2a9b2af9daed02f93f55f383 SHA512 499511446f69ad696b7324482733951e5ee5a9427a4b6d24fb28ae3a49ededd2ec804aff7db80345780892eda9c53b1ae0de05f77f7138305cfd3f4b6c6517e5 WHIRLPOOL 4cb7d12182e168b79ef781fe4b88cae988b2e840af96f58883274b4d4d1c80e5663531894a064a4abfd3d23bdf6187ae82a4d210abb26c52df4a1686e91b4162
 AUX FindQtSingleApplication.cmake 4004 SHA256 4a66ba88dd54d565656e2abaf48aef05c2dabe5a688bbf2359050c0b07face1d SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e WHIRLPOOL bf9ca4ae3fc9f55faee3e1bdc921a822de9341e3429b5a71842a330357ab4d48f16963cbfa386b3274100ce7adfe92b1b894d086184c05e11e48a92bb6ac5c67
 AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 SHA256 11c4674be63f375bc0936ac99f5ce7534e27e336dabcd79441cc2781567c6b09 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3 WHIRLPOOL 30d4266e480d46ee17e178d51e20c0c79412ee2baf744898da7965f636d73d2dd7cd93f57eff3034f15008ed654769552d944090473463f6a6643c525894fd4d
-DIST juffed-0.10-1054.tar.bz2 1657118 SHA256 ac58d32acaf9d60e4758e9ae05b1a6b7fc0cb7ecd3b207db769dbb9c747be16c SHA512 023e9fca1f02fdb39645bd41700c7481fe8d6ae08ec62b0bf5ba58f627eb6872f96d27f05eae4bc92d90fd204dd0c30f868c858de873ab6511ac21748254b47c WHIRLPOOL ceb9e0dc9100dd5f2578abc14fff336adf664726d8e347f9832ffc4942c36e6e28aaff931fd528e6f572bcb29e4027ee486a82ee93d216d0751b5d8aa4233f6c
 DIST juffed-0.10_p20160323.tar.gz 1617451 SHA256 15d84bbda71cc8f44f7e0f2c114609859ca90602e86e40f00394d372ab87b5cf SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5 WHIRLPOOL 1aac9f820fd842890784979436a7e5afe706af62bcbaf6d5d837749ab26bae79ed5b4d10bc833351f8b2eafd1760f86e3f7f1ca51774a282ffdd85482152c68b
-EBUILD juffed-0.10-r1.ebuild 844 SHA256 4cfbfee65fedc8f465565eae5fde59e45deae11da4a6408a420a5a8c53d6dc5e SHA512 8a0c78b81c02a089248d1928a3eb0d2a2640b46b43da15ed6c2e7463bbe6c6abcf0e06507a65011cd001094285fb959db70410cba500ee31b816cbc5f7587da6 WHIRLPOOL 769acd242643724e99c311bc1124f0fed934cf2a0cc44b920c1952bcbff55e8a06e77d4d8b8a98620b05741c41a62fd033e7b81447aad34427b024af7fcaabda
 EBUILD juffed-0.10_p20160323.ebuild 1348 SHA256 5e2f2bf75f934897dc612debfe87a58623b8e88339052de5260f8cf54237f2a9 SHA512 38a2c1ffdbabbef866bb3ddfc14b76f36122297d71ffa3d73cb6d89d49c1d14592ee975959476c8e2dd087a34fe89593a1a1a9947d92d49ba5e328b39ae92546 WHIRLPOOL edb8622a04053508b026ecd182cd34303a4d901a0f37fac54a5cd6bed2dfbcb375326a237902db349fd5f9b3989203e055cbce9ed4295a4f18662d120f9a0bc6
 MISC ChangeLog 2475 SHA256 6b7433c35efea440cc5210efcf9d6142cafd5c829d70d32a1dc3546200642297 SHA512 fab6013dd39860d44515839ebedcc3a3c3fb93f12eba1cc8a96f6f68eaab528c5f4a9aab18dc009997310daaf848e2ba3b3cdeaf1ad24903e860fd31bd1c5858 WHIRLPOOL b9ab49ca82887292f43c492909af45fcb29e051c27c69fcf4f7a1240ec7854ba781a29bdfb8f23eade0bd545500c63571fd65878b57aedb918175c4a8194e338
 MISC ChangeLog-2015 4917 SHA256 8beb243682f51395a88219ab2bcd1cecc42a65b6e5c8d38b6c0682d960a81bff SHA512 262463d7437dfa0e9db72474b72e56854256f5c4496ca5f7507b03bce7b18b32603fbd0aafe29ea857b7f0ebafb2372ec4ea3a941ae7297cf39a8f1a7004ecea WHIRLPOOL cc1e1600bd73a3123caa3b8a4a20e2ee18cc71e760ca9054cf2d40508141c8b2f74d68350ce38535ffdd28eb638076566e65a8fda046d4a5d4d3aabd5bf76c60
diff --git a/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch b/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch
deleted file mode 100644
index 5bd3882309ae..000000000000
--- a/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ccad5d1..304c0aa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,6 +190,9 @@ add_library ( ${JUFFLIB} SHARED
- target_link_libraries ( ${JUFFLIB}
- 	${QT_LIBRARIES}
- )
-+if (ENCA_FOUND)
-+	target_link_libraries( ${JUFFLIB} ${ENCA_LIBRARIES} )
-+endif (ENCA_FOUND)
- 
- add_library ( ${QSCI_ENGINE} SHARED
- 	${juffed_qsci_SRCS}
-@@ -277,9 +280,6 @@ target_link_libraries ( ${JUFFED}
- 	${QT_LIBRARIES}
- 	${QT_QTNETWORK_LIBRARY}
- )
--if (ENCA_FOUND)
--	target_link_libraries( ${JUFFED} ${ENCA_LIBRARIES} )
--endif (ENCA_FOUND)
- 
- if ( UNIX )
- 	set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra")
diff --git a/app-editors/juffed/juffed-0.10-r1.ebuild b/app-editors/juffed/juffed-0.10-r1.ebuild
deleted file mode 100644
index 66870bccf3c3..000000000000
--- a/app-editors/juffed/juffed-0.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1054.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	app-i18n/enca
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsingleapplication[qt4(+),X]
-	x11-libs/qscintilla:=[qt4(-)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
-	# bug 540554
-	"${FILESDIR}/0.10-link-libjuff-against-libenca.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index c6f0b0d6067b..0175f02d8baa 100644
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,6 +1,8 @@
 DIST ne-3.0.1.tar.gz 1193311 SHA256 92b646dd2ba64052e62deaa4239373821050a03e1b7d09d203ce04f2adfbd0e4 SHA512 3750140a49c7424e92e509137d5f31d305b81d41939a2578f6a26065216ebd1aa444b0e8d7e79dd09cc525e1055cda4d756f21ec810f860063d2eec861ea8273 WHIRLPOOL e0630f7e077400393ee5734989327369f2d646c88a32313f193b34e7f44d7962b368a5deb5876cfe997e34295078b44fba1672cfb257ef3dc08a8597a5708a5b
+DIST ne-3.1.1.tar.gz 1219488 SHA256 ec4f5d919c38b1a5938b609a722d0d88a68c404b4564e3bb654b96b30582add9 SHA512 e572ca2a0cd39a59adaea911c80e083872103d90a586117efcabbc3881cf1a48d0c3d06f20eebcd9254177afafef15fd581778cd251b1b25b64ad68a5f8afc37 WHIRLPOOL 3ebfa725f5a85da6102fba3bf67678bf38380581d7b76df1e441d2825faed261089de2438525aa1e3fd90ad91ad75f460657b776b4c0b2f046d02a15f344434d
 EBUILD ne-3.0.1-r1.ebuild 1111 SHA256 a300bcde964b1d54fe60dbe769f6977b015a8cce16d88fbd67c40ec5157e2f86 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec WHIRLPOOL 98f2d5a2fe2b710c4842320cb38e0e05f4839aebc2673627afcb8e4a8ec1baee9acfcc7ae99b97d6f4433dbf94d8435d021143885088bb0b8e0af8948e915cf0
 EBUILD ne-3.0.1.ebuild 1101 SHA256 8b34a221b0208af80ad884988819ff1af99ccffd48fcb97e7d53486030fa9c4a SHA512 13bafaacb212b744bc41aa91e42c56a3ca266f564f98ddf974005eba08924d71aab27364e8777811030884717585bd9952bc7e1402bd02ada7082ec777cfa621 WHIRLPOOL 7286de612032910c0b84ec3949909fffa6d7a05fe0c8ef378a81d0bc3be5d5fafb9bc6c2870077ade1fe1906bcc33d595f1a6ec3bd097509e7bddf0b873f4867
+EBUILD ne-3.1.1.ebuild 1111 SHA256 a300bcde964b1d54fe60dbe769f6977b015a8cce16d88fbd67c40ec5157e2f86 SHA512 bfba8a0823cefb302869bc454b83ab1e1deb23d2eff52d779a453d20b3a250327e9e5003aca3c1d75c7048572f2ddbd2869af9687ff12b4667d110bbeb9bb7ec WHIRLPOOL 98f2d5a2fe2b710c4842320cb38e0e05f4839aebc2673627afcb8e4a8ec1baee9acfcc7ae99b97d6f4433dbf94d8435d021143885088bb0b8e0af8948e915cf0
 MISC ChangeLog 2941 SHA256 f45b71f7128d2dec2bcf611975a8d961a9166b0dc7967cf7f013b921f76837fd SHA512 5dd3683dff2481ab514e31d00694c4e79adfc5b444f0a4ef4610b03400d12e2b0a7a134dc941c8ab1e849831bc339784e1a1d56a231e3af973a1fa37df272cbd WHIRLPOOL e8fe1f9a236f187927ec71a9e0585442783b599b640860543c3b479bde0e5a35433d09013fc5de26353d1f4c9c73235a1695fc6f936ef2130cd023e1d3d8cbc8
 MISC ChangeLog-2015 6623 SHA256 d196f62f390526c00352c77e510de527cc5f301a29326f4c14f4b92a24a5da12 SHA512 5b22baf0de6591e047f9cc46624ab17bec359742b67a1c137af336987d09dbf162d24a0e3fe0efa123529950c64d406a5c85f38843f6c6dff00d21f9d4af677d WHIRLPOOL 6f420309db651efe52690da819ad1b6b2451a5ebb690d078bac7f6adb0ae9f844084547db101525dce53a2847537c005eb4275c4d977e842d20ad7574da6ad3c
 MISC metadata.xml 249 SHA256 6619963d2d2ea271e4d62f50c0c66b8e0b009157c31d6dc1b762bbb12a08c195 SHA512 40160ace781dd306147377e882be12701aa73684143080278ac55ba434185e3673aeadad11224743eefa70962ed005db0337e2ef2b5dbe6eb9fdec01bf72283c WHIRLPOOL ff4a1979205a1c9668cb80bef450114bf3258843a81573cfd2638f1e6b0f85edc75ef79c14c0c11e92a6b75022cb69cc6df1275e9c1a12e0ef8a5b32502938a3
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild
new file mode 100644
index 000000000000..9d68adc0f1a0
--- /dev/null
+++ b/app-editors/ne/ne-3.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="http://ne.di.unimi.it/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="tinfo"
+
+DEPEND="sys-libs/ncurses:0=[tinfo?]"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+"
+
+HTML_DOCS=( doc/html/. )
+
+src_prepare() {
+	default
+	sed -i -e 's/-O3//' src/makefile || die
+}
+
+src_configure() {
+	local sedflags="s|-lcurses|-lncurses|g"
+	use tinfo && sedflags="s|-lcurses|-ltinfo|g"
+	sed -i -e "${sedflags}" src/makefile || die
+}
+
+src_compile() {
+	append-cflags -std=c11
+	emake -C src CC="$(tc-getCC)" \
+		NE_GLOBAL_DIR="/usr/share/${PN}" \
+		OPTS="${CFLAGS}" \
+		"${PN}"
+}
+
+src_install() {
+	dobin "src/${PN}"
+
+	insinto "/usr/share/${PN}/syntax"
+	doins syntax/*.jsf
+
+	doman "doc/${PN}.1"
+	dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.*
+}