gentoo resync : 02.04.2018

3 files changed, 105 insertions, 3 deletions

diff --git a/app-editors/jasspa-microemacs/Manifest b/app-editors/jasspa-microemacs/Manifest
index 71815663e79b..344160d63769 100644
--- a/app-editors/jasspa-microemacs/Manifest
+++ b/app-editors/jasspa-microemacs/Manifest
@@ -5,5 +5,6 @@ DIST jasspa-mehtml-20091011.tar.gz 628008 BLAKE2B 97c8326e7acfdc4bc4ddd2ef6bbcf0
 DIST jasspa-memacros-20091017.tar.gz 1105437 BLAKE2B 0a74715db55498fed646f209a9121a96c673cb34c487968c4f838bacf6404db717fbd8392d26f8fa120174923724af91e4a14bda088bf229765d1e99c785d8ba SHA512 08908acac4dbe56695362172dabe621b8cca77a35da599c6cf5b4e87700c03f4ee190ca12d5c69b2d88c623cec527daac0980dec2ed713ff563e88ebe636a725
 DIST jasspa-mesrc-20091011.tar.gz 810128 BLAKE2B ce627dab7cf4ec09b099e755c3eb17e773c64fbff60741244cdb134ee1555ffff592ef3684eecae72d5da36c10cd7caa23a03112154c616ad3c7667d913354b4 SHA512 60cc5a83b3cafd8e517f88732dc94feb0329b962bc714eaa5616ba89776fbfac41833be88fd3a666443291184086494434fb8763747c1dc5e216ce793b694b68
 DIST meicons-extra.tar.gz 43345 BLAKE2B 5b3d6e8a76604364d8e5464ba764aec96d822054c02bffed4cd763f7691f78bc3455904cd06d89ddcf8a0861134ada3c7d228751d4f3685e6700ebfc3dda2354 SHA512 bb6879fb12ec1c7b346bc1df2412a837ffdd0569f6be2800a433307a7736bb31798b3c2a71e02cebdce39c59d93d1a986f80c92184604e4292606c98285fe02a
-EBUILD jasspa-microemacs-20091011-r2.ebuild 2112 BLAKE2B 0ee0fa34a3ddedf3c6d3a540fffb735f32d89838acd97888d7491551bd231e6c49b27e5be747db464732452a4dcbf3ded757ac921ac07f594149b0ca593dff88 SHA512 a0c924ea30ef893be7c374d12317dda6f1374f84286b2ed749e416b86d7c71965b271610e988f594a1dbe0abe0aaf65ba22d22f95cf2f114cf0fe1d6ce7f3858
+EBUILD jasspa-microemacs-20091011-r2.ebuild 2115 BLAKE2B 007a275b88257cc808c872a7e659851f13fbc0916d4b8c1789e0e83fcf849b9bc317819de2e9785e240412bd967f6eeaf2f7d403399b28f102f07cbd2c6bd17c SHA512 ae515ed70c9b13b891de1cb703323555df57a7002a5aa69815b7f50aaf6f4e11bb155aaeb52d4cd60295a4d27e2cb50f5b0d8a3c61e99aa33bf01bb13986576c
+EBUILD jasspa-microemacs-20091011-r3.ebuild 2322 BLAKE2B c0f6dfda03b15f0a1b308b4e0a78ac18b2384fe4b12f751444319c8285dae66b53ef2290e0c0b1e37f29cdc60757db295f0480502fcc33477eb869a0bebe16f3 SHA512 2e9575d8093c8208ad41ecc199fca54cff4ebaf7c603fb3aea615d9f5fec0366ea9d4faa263f5a94a3c24c5fbd8414ad0939b1edbdb29f01767df127ff93e416
 MISC metadata.xml 1094 BLAKE2B 9983b2ebf7f9d7a979180ea0d4aa063ace2fa5a3a630339bb8112a8691eb6b46964d298d9b49c2d02b2dba2750e501b5740de2242da00abc4b24ba08af8d7fb1 SHA512 2116ed586b24da86206c4d38977c118bcf2381d455a3cd0fb9d672f8d709b5113fe4c8767e2d2f20f8c879a71f0e6bfb6384b9efe30cba82e177fa75dc4e0d6a
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
index 55e0722235c9..eb138ec6f5bb 100644
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -27,7 +27,7 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	X? ( x11-libs/libXt
-		x11-proto/xproto )"
+		x11-base/xorg-proto )"
 
 S="${WORKDIR}/me${PV:2}/src"
 
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
new file mode 100644
index 000000000000..770b292dd3e7
--- /dev/null
+++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs xdg-utils
+
+MACROS_PV="20091017"
+DESCRIPTION="Jasspa Microemacs"
+HOMEPAGE="http://www.jasspa.com/"
+SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
+	!nanoemacs? (
+		http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
+		http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
+		http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="nanoemacs X xpm"
+
+RDEPEND="sys-libs/ncurses:0=
+	X? (
+		x11-libs/libX11
+		xpm? ( x11-libs/libXpm )
+	)
+	nanoemacs? ( !app-editors/ne )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXt
+	)"
+
+S="${WORKDIR}/me${PV:2}"
+PATCHES=(
+	"${FILESDIR}"/${PV}-ncurses.patch
+	"${FILESDIR}"/${PV}-linux3.patch
+)
+
+src_unpack() {
+	unpack jasspa-mesrc-${PV}.tar.gz
+	if ! use nanoemacs; then
+		mkdir "${WORKDIR}"/jasspa || die
+		cd "${WORKDIR}"/jasspa || die
+		# everything except jasspa-mesrc
+		unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
+	fi
+}
+
+src_prepare() {
+	default
+	# allow for some variables to be passed to make
+	sed -i -e \
+		'/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \
+		src/build || die "sed failed"
+}
+
+src_compile() {
+	local pkgdatadir="${EPREFIX}/usr/share/jasspa"
+	local me="" type=c
+	use nanoemacs && me="-ne"
+	use X && type=cw
+	use xpm || export XPM_INCLUDE=.		# prevent Xpm autodetection
+
+	cd src || die
+	CC="$(tc-getCC)" \
+	CONSOLE_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
+	./build ${me} \
+		-t ${type} \
+		-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
+		|| die "build failed"
+}
+
+src_install() {
+	local me=me type=c
+	use nanoemacs && me=ne
+	use X && type=cw
+	newbin src/${me}${type} ${me}
+
+	if ! use nanoemacs; then
+		keepdir /usr/share/jasspa/site
+		insinto /usr/share
+		doins -r "${WORKDIR}"/jasspa
+		if use X; then
+			insinto /usr/share/applications
+			doins "${FILESDIR}"/${PN}.desktop
+		fi
+	fi
+
+	dodoc faq.txt readme.txt change.log
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}