gentoo resync : 02.03.2018

3 files changed, 47 insertions, 112 deletions

diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index a52a4aa8b9f1..11b7d8a2c622 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -15,7 +15,7 @@ AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d1
 AUX xfig-3.2.6a-urwfonts.patch 4933 BLAKE2B eb1edf6b30966864dbdf3e932f2cde231ff5777cdc0dff34cf047a169335ba78e493b10817e39aac72221d17d491138c3c28a3b293582d3808255140d5df6762 SHA512 29fea111b6c07f6ea28bc46259c0dc8d20b1bbf86e33d550037744b93d4f4de7ec9c4ea7fa14c5f91a4278848216d183ac841970c798140359e1fc317baac468
 DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
-EBUILD xfig-3.2.5c-r1.ebuild 3203 BLAKE2B 7525f53b1b9a9d05fee6c04c53486e5b6954122b0898c0658869432a36730a91e47c4cfe694755e27baf4fe7328f7b4380adc6b4ed08248b9c7adba884e685c7 SHA512 45971e1e43c8f54d0c1a4a57596edae08e52239dd06dd066ff6186c6da759a823b78becd86d3249e17b98f1ef0aafe8aec552669120ebae634391a8d5d3d7b35
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
+EBUILD xfig-3.2.6a-r1.ebuild 1195 BLAKE2B 417a2288dc0c2ffef4e410ef928c263c16ce2bbc007223cb63056482a81db14dbc20e2ef83db1b41afe155efa39d3c1bf87f43846a0f4a905d78f2ec6b40a580 SHA512 3ac4318244774a3a73fcf1ccb958a7bef931c0165927e293d8557f181554c6aff41e4e2e7365750d5d9bdd7fee5c08c892d80720d001f1f3894bfed294ccecc1
 EBUILD xfig-3.2.6a.ebuild 1207 BLAKE2B bea38ebc749e077fed56f3d6f4a97a25ae7aa40bdf81e6f9bbed9b78462ad41930957efa3af37c82eec653905a59da5af48253ee4496720896286ddb76a361bf SHA512 22b7b0f96d4459081e8978cc6219c7bcef30861df54b0211bd8ce334a32f61b9199be8ed0c78008bd2b4ee699f8276ab30dc5865849b918e5c16928335e3a958
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.5c-r1.ebuild b/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
deleted file mode 100644
index bbe838eccc23..000000000000
--- a/media-gfx/xfig/xfig-3.2.5c-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
-HOMEPAGE="http://www.xfig.org"
-SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="x11-libs/libXaw
-		x11-libs/libXp
-		x11-libs/libXaw3d
-		nls? ( x11-libs/libXaw3d[unicode] )
-		x11-libs/libXi
-		x11-libs/libXt
-		virtual/jpeg:0=
-		media-libs/libpng:0=
-		media-fonts/font-misc-misc
-		media-fonts/urw-fonts
-		>=media-gfx/transfig-3.2.5-r1
-		media-libs/netpbm"
-DEPEND="${RDEPEND}
-		x11-misc/imake
-		x11-proto/xproto
-		x11-proto/inputproto"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.5c-spelling.patch"
-	"${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
-	"${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
-	"${FILESDIR}/${PN}-3.2.5b-network_images.patch"
-	"${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
-	"${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
-	"${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
-	"${FILESDIR}/${PN}-3.2.5c-darwin.patch"
-	"${FILESDIR}/${PN}-3.2.5b-solaris.patch"
-	"${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
-	"${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
-	"${FILESDIR}/${PN}-3.2.5c-png16.patch"
-)
-
-sed_Imakefile() {
-	# see Imakefile for details
-	vars2subs=( BINDIR="${EPREFIX}"/usr/bin
-		PNGINC=-I"${EPREFIX}"/usr/include
-		JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
-		JPEGINC=-I"${EPREFIX}"/usr/include
-		XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
-		XPMINC=-I"${EPREFIX}"/usr/include/X11
-		USEINLINE=-DUSE_INLINE
-		XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
-		XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
-		"CC=$(tc-getCC)" )
-
-	for variable in "${vars2subs[@]}" ; do
-		varname=${variable%%=*}
-		varval=${variable##*=}
-		sed -i \
-			-e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
-			"$@" || die
-	done
-	if use nls; then
-		# XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
-		sed -i \
-			-e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
-			-e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
-			"$@" || die
-	fi
-	sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
-}
-
-src_prepare() {
-	# Permissions are really crazy here
-	chmod -R go+rX . || die
-	find . -type f -exec chmod a-x '{}' \; || die
-
-	default
-
-	sed_Imakefile Imakefile
-	sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
-		-i Doc/xfig.man || die
-}
-
-src_compile() {
-	local EXTCFLAGS=${CFLAGS}
-	xmkmf || die
-	[[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
-	emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
-		USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install install.libs install.man
-
-	dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
-
-	doicon xfig.png
-	make_desktop_entry xfig Xfig xfig
-}
diff --git a/media-gfx/xfig/xfig-3.2.6a-r1.ebuild b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
new file mode 100644
index 000000000000..44de42d398d4
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.6a-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://mcj.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="jpeg nls postscript"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXi
+	x11-libs/libXt
+	media-libs/libpng:0=
+	media-fonts/font-misc-misc
+	media-fonts/urw-fonts
+	>=media-gfx/transfig-3.2.5-r1
+	media-libs/netpbm
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( x11-libs/libXaw3d[unicode] )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/inputproto
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
+	"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+	"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_enable nls i18n) \
+		$(use_enable jpeg) \
+		$(use_with postscript gs) \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+}