7 files changed, 51 insertions, 114 deletions
diff --git a/app-shells/dsh/Manifest b/app-shells/dsh/Manifest
index 013e4e08261c..2830e3c5239d 100644
--- a/app-shells/dsh/Manifest
+++ b/app-shells/dsh/Manifest
@@ -1,4 +1,5 @@
 DIST dsh-0.25.10.tar.gz 394506 SHA256 520031a5474c25c6b3f9a0840e06a4fea4750734043ab06342522f533fa5b4d0 SHA512 a53fba14e65644ce5858b1e9827601016db6d61cb50b0229ea53eeaee676f5870d2dbfd6ebde237008bfc7144316484529c646104e72d99868d44d814a41a009 WHIRLPOOL 63c88c40063ca333c9c94d4e83847c122443e6edb5754efa8b2da0182378c58c79dd26d2a368b63d0956dd760e4b37ce35627222bdb17a95e81f7e56657e0fdb
+EBUILD dsh-0.25.10-r1.ebuild 585 SHA256 e61cda8033e0aa50d29e963b1ef32588b76e68d2aa77deaed218341a0413610e SHA512 919583832c023cad1260a642c0d684e632d1de9984b377ff743a9f40e1cf67d00519e413cde03fe629e5f2a160659961025d24f3167db7549a66582bfff8dc98 WHIRLPOOL 2193a18f39115d5ec52937b90937819f84afdd348453dba9cf8c7b698c6a5bb94fd990384ba1f7cc7790da80a36a33283f8c13ae984383fccd384b6b3b19fa21
 EBUILD dsh-0.25.10.ebuild 682 SHA256 d716ab393a50f4599def7bd0046fc6b25eaac1f2ac8a907760355f08879e9a02 SHA512 d11da3036bc12f7479e39dec0834e701dd16be5f1685770a85090c16f59cb3345abffe17c557d0e668ae224a86e3d0ce33a779bc8bf2184b5cb83ea5fe221f96 WHIRLPOOL ab389fd4e407e7b06cb00649172584f4d3a8d8e2009dd0bc182cbd582be6e7bd86fa88c69176c600b5b8abd35ac6c448e86e2d54e003ea365991463b584a9c66
 MISC ChangeLog 2421 SHA256 f87ff37c2a05783a499f7346ed04d39ac226ea5ac62ddddc47bf61300aa40d34 SHA512 3d441cee8c6988209081812e8461dcfbabadee3a47ce05617b4652735a7e3ed0ced634b7a7b53dcb896bd896924c61f582d80dd7b3edfbc5922251ae59b926dc WHIRLPOOL c4ddb2f66bc3bc01d33e1d51a0b65442635621252d84b24135fc4557cdc29f8e78bd30593a9c7f53204de5f59b0144cb2087365fabbdd1a87d36e319a8353a26
 MISC ChangeLog-2015 2612 SHA256 098ae8935a1250351518b98c6a34c0245f2a29b520834e222838e3b3d40e2d20 SHA512 68a11bdf7933bedb2e9238ad0cc0e42ff093774458bbb29b25543e037b4c3200696722e37d6bab108897cb714e37fa2b05c4d4c31691b657bb7e9063d4b13da8 WHIRLPOOL ad77607a125cba22a432fcde3b5c181e6067c5c7d1bd048a84931bd5ef2dc1008e94cbfa07d32bf48cf1166444a8ad431b31c539d41b73280e1a0a21463db7df
diff --git a/app-shells/dsh/dsh-0.25.10-r1.ebuild b/app-shells/dsh/dsh-0.25.10-r1.ebuild
new file mode 100644
index 000000000000..8d90bcca9f0f
--- /dev/null
+++ b/app-shells/dsh/dsh-0.25.10-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Distributed Shell"
+HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/dsh.html.en"
+SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="nls"
+
+DEPEND="dev-libs/libdshconfig"
+
+RDEPEND="
+	${DEPEND}
+	virtual/ssh"
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/etc/dsh $(use_enable nls)
+}
+
+src_install() {
+	default
+	dodir /etc/dsh/group
+}
diff --git a/app-shells/scsh/Manifest b/app-shells/scsh/Manifest
index cfa82cfd33ea..a9812840775b 100644
--- a/app-shells/scsh/Manifest
+++ b/app-shells/scsh/Manifest
@@ -2,9 +2,7 @@ AUX 0.6.7-Makefile.in-LDFLAGS.patch 373 SHA256 a814fb4c2669b608e9f5d5fb430f4dd80
 AUX 0.6.7-Makefile.in-doc-dir-gentoo.patch 4100 SHA256 b66f64da00228e4bbc69b7b0422a296edcf36a73c82fc841ac422770ccf46451 SHA512 e2b647cb89f6972aece5172eea7f186bc9181b80138c7860972deb615959256eed4e99a5ff939a4e50ee6fae1de6e5cd870592f468749fc0df8d2a24e0ad0ee0 WHIRLPOOL 2bebe135ac8edfd67dd75d0602224504161ff03f44a2e20aa255bcae63b122e0b7844900a56a186eaa01526cabf267c0c034c6b4abe5962a73a1333b89a2f7f4
 AUX 0.6.7-Missing-includes.patch 583 SHA256 56ba1f9113215b894d0652c2e7033a11e6e0ba7150c5c6c0aa285fc36c1030a8 SHA512 dfe27f640d0b8c1e430be67ee0ca326720063ea3254d2c7ad91a9dc1de17cc32fac4158897250744de219b35665d1e74aa4ab3b64d3b323cf1bef1f560ffbc02 WHIRLPOOL 2325022ebc5a2da0f6966ce1c5c10e48075d5b9867d9556129964d932e40e993eda8e6a51152b4048b7ef24ad504f3bdb8034b1ae43f4724652d7fc5ca59a3bd
 DIST scsh-0.6.7.tar.gz 4367439 SHA256 c4a9f7df2a0bb7a7aa3dafc918aa9e9a566d4ad33a55f0192889de172d1ddb7f SHA512 d769b3d70afe813a3d25ef1b77d8dbc549b379ca41b0748cd90791408a36b33ed3ce08937bfd925bab411785aa671761d79bbf2edd9caf0c3ea6c44d90f4b6ea WHIRLPOOL f3d990385b1635d44104f275909803cd08795dd309c183826437be0ab796ca13afca874a6c716d5248facb64d4daae088bd5e558b2da5c6c70432069dc034381
-EBUILD scsh-0.6.7-r1.ebuild 1000 SHA256 cabb688f4738357306de6bc68980ee71ff392f871a21fb539f9f33f0e4ddfd4b SHA512 0e6a64c7b504c6048e39b3ab97cfe5e51a0dd5e927e5f09ce7272214348584a270bc383d5d61e53ca7902f8cb0dde6f3ed87ed0633d4e3f955fe63b49fb5ca44 WHIRLPOOL 4562c2076b8170a57a424489c0016da25639e56a7845461de9728d43a17ed57250f45a52f669552c3342cca2b47bf258293ab835d83fb90aec21dcdc755c115a
-EBUILD scsh-0.6.7-r2.ebuild 1009 SHA256 e69f43e36365244fe602a04933383b5200bcf0013eb4a89f65ac8b0c43a6fee7 SHA512 e7b471dde1cde647ce36e5c8ab31a0dbbd880a2f69ae54a6a5ca3646845851094c588b612b93c78fee3d9b4deeb5e6ffcbcc08d6111ad67355d73dd9a696cd94 WHIRLPOOL 30d6ff9fbd137981d0fbf56be70606f5cbd79f3f1d1e7790ebe7bb5605738526b1fd24b7d34a07772ed261e08ac1a05d66cbdc2245fe9e482a200a564f31d65c
-EBUILD scsh-0.6.7.ebuild 892 SHA256 9064cf7f6b27289d64a637573dd9330ca3f482d824943a48c3cec07f2789c794 SHA512 d62a044d179ac8f18ee5e08f5041f6865ef1bf58f206d18e3f195fd17485d29a73c60de62b6e0096c6e15cfcc0f815070bf761ce00bd5f6ab8c9d9b74ac170af WHIRLPOOL abc1ca3594efa9dd31f6dcea22418ceee23dd5c43f66869210d5e144d3f64f2fa9c6aad9a2239cf8df54d2b6b3f2b806c842baafa5c5ff849bc87459b3924cc4
+EBUILD scsh-0.6.7-r2.ebuild 998 SHA256 5b4baadb898d8325539beeb498dafea2bc4d84d702f42e0ee44b7c336e947ca0 SHA512 5e84813c026c85c232e6ceef7c7f4e0eb2df1c6954b1ed80c27c7c01f31026e59cdcf24d07be4e4d731518b1ce593c512a84b4bfce2673c4d882b755751f30f3 WHIRLPOOL bee6654ae03d184eb2b6c06e69828d259880463404de5081d65d948acbabeaade366bb59842b1c7dd1bea2dbd8fb18b0d8de339c6d5b1bcc2e319505ae05d6a7
 MISC ChangeLog 3147 SHA256 453700d14f907bbddd12e5ddc5afc8fb834261939c28a861ba57882a37afc0ce SHA512 ccf7a5ee4af69e25908ed0168cda3a3118941ead0176b97c5abbaa635fc4f8a3129184c7d42b39474be453b164b0c3a0d739423a5a80ca599d2ca7e9988a6ff7 WHIRLPOOL 54b5acb2c8047b91a3a618cc663c8db3d18b3164270c514b1aa1452c416723d0fbe0f14d87f4edd7e7e48b822ac9c125812fef4b924346c1275339a6c27fb919
 MISC ChangeLog-2015 4663 SHA256 347eb0bd8be556ab252278429025c944f7fb97431394c064e6c4d0eac39b0a75 SHA512 c52b692717d2acb69859243f3a1bb13d7d4dfc72bdd023f3d0c46f9be912008da1958f194ae834246e6a81899598852065e03c06028271366c83e410e0687b98 WHIRLPOOL b0a6c319c0f83c8c0d37a5a93bff651fd13bb092b0fc6b1b7802f17861e63fa4424e2a57b0f55fda3db1d8ef04afddf99883e2bc6e012eeb49e427a8cdf91f49
-MISC metadata.xml 1063 SHA256 49e80c536f3324b9f93457026e7f5a84854e3a354bcedd238c6840d5fd775ca2 SHA512 ba154087b35e266ce60888d7e411a498a05f2ac177926d15ed12461c7e3de17186a9335814ee165a6a13d9de20351f981b040da6078f0a5836f7a234b1797ffa WHIRLPOOL cc81a66d1d252a4ab78b0f87f730455ee649a061560b351aca1ca50e619451f649c5c81cabc06ea33208a7d909e4fb246096900796e288b2484e41560e966674
+MISC metadata.xml 1013 SHA256 79bff1ee09fe867f5ad6766bcdc884160d15facef09fdee42fefca1487182e15 SHA512 43730dfd3367fa6088a75f75a4aa8815121e01b9ed47bece37a1cd43cffbb016195b0bff969370a993726d50cb105f6772b75389cb8bd2f4f035c7176576400e WHIRLPOOL 8841a630875b4c3c47094ef35e19dcefe91a199f3d42da4944930f0717d29eb59829f6d96be515f6645999b403c7e0e8edca11cb98d93acd4bf3f4e43bb68d3d
diff --git a/app-shells/scsh/metadata.xml b/app-shells/scsh/metadata.xml
index 317ccdbc4337..0d54e8853cd8 100644
--- a/app-shells/scsh/metadata.xml
+++ b/app-shells/scsh/metadata.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>scheme@gentoo.org</email>
-	<name>Gentoo Scheme Project</name>
-</maintainer>
-<longdescription>
-Scsh has two main components: a process notation for running programs
-and setting up pipelines and redirections, and a complete syscall
-library for low-level access to the operating system, i.e. to POSIX,
-the least common denominator of more or less all Unices, plus widely
-supported extensions such as symbolic links and BSD sockets. 
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<longdescription>
+		Scsh has two main components: a process notation for running programs
+		and setting up pipelines and redirections, and a complete syscall
+		library for low-level access to the operating system, i.e. to POSIX,
+		the least common denominator of more or less all Unices, plus widely
+		supported extensions such as symbolic links and BSD sockets. 
 
-Moreover, scsh provides an awk facility for pattern-directed
-computation over streams of records, a rich facility for matching
-regular-expression patterns in strings, event-based interrupt
-handling, user-level threads, a futuristic module system, and an
-interactive environment. 
+		Moreover, scsh provides an awk facility for pattern-directed
+		computation over streams of records, a rich facility for matching
+		regular-expression patterns in strings, event-based interrupt
+		handling, user-level threads, a futuristic module system, and an
+		interactive environment. 
 
-Scsh comes with extensive documentation describing these and other
-features.
-</longdescription>
-<!--
-<use>
-  <flag name='scsh'>Use a non-FHS directory layout</flag>
-</use>
--->
+		Scsh comes with extensive documentation describing these and other
+		features.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-shells/scsh/scsh-0.6.7-r1.ebuild b/app-shells/scsh/scsh-0.6.7-r1.ebuild
deleted file mode 100644
index eda1276277a6..000000000000
--- a/app-shells/scsh/scsh-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV="${PV%*.*}"
-
-DESCRIPTION="Unix shell embedded in Scheme"
-HOMEPAGE="http://www.scsh.net/"
-SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="!dev-scheme/scheme48"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
-	epatch "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch"
-	epatch "${FILESDIR}/${PV}-Missing-includes.patch"
-}
-
-src_configure() {
-	use amd64 && multilib_toolchain_setup x86
-	SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}"
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--with-lib-dirs-list=${SCSH_LIB_DIRS}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed."
-
-	local ENVD="${T}/50scsh"
-	echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}"
-	doenvd "${ENVD}"
-}
diff --git a/app-shells/scsh/scsh-0.6.7-r2.ebuild b/app-shells/scsh/scsh-0.6.7-r2.ebuild
index b1910140c902..170f8f2f1eac 100644
--- a/app-shells/scsh/scsh-0.6.7-r2.ebuild
+++ b/app-shells/scsh/scsh-0.6.7-r2.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,8 +13,7 @@ SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
-IUSE=""
+KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="!dev-scheme/scheme48"
 RDEPEND="${DEPEND}"
diff --git a/app-shells/scsh/scsh-0.6.7.ebuild b/app-shells/scsh/scsh-0.6.7.ebuild
deleted file mode 100644
index d32f9236bbff..000000000000
--- a/app-shells/scsh/scsh-0.6.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-MY_PV="${PV%*.*}"
-
-DESCRIPTION="Unix shell embedded in Scheme"
-HOMEPAGE="http://www.scsh.net/"
-SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="!dev-scheme/scheme48"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
-}
-
-src_configure() {
-	use amd64 && multilib_toolchain_setup x86
-	SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}"
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--with-lib-dirs-list=${SCSH_LIB_DIRS}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "make install failed."
-
-	local ENVD="${T}/50scsh"
-	echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}"
-	doenvd "${ENVD}"
-}