[gentoo-commits] gentoo-x86 commit in app-dicts/wordnet: metadata.xml wordnet-3.0-r4.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in app-dicts/wordnet: metadata.xml wordnet-3.0-r4.ebuild ChangeLog

[Justin Lecher (jlec)]

jlec        15/03/19 14:32:00

  Modified:             metadata.xml ChangeLog
  Added:                wordnet-3.0-r4.ebuild
  Log:
  Fix tcl/tk slotting; bump EAPI=5; fix for format-security
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.4                  app-dicts/wordnet/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-dicts/wordnet/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	5 Jan 2014 11:32:13 -0000	1.3
+++ metadata.xml	19 Mar 2015 14:32:00 -0000	1.4
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>



1.27                 app-dicts/wordnet/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/ChangeLog?r1=1.26&r2=1.27

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog	22 Mar 2014 18:30:47 -0000	1.26
+++ ChangeLog	19 Mar 2015 14:32:00 -0000	1.27
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/wordnet
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.26 2014/03/22 18:30:47 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.27 2015/03/19 14:32:00 jlec Exp $
+
+*wordnet-3.0-r4 (19 Mar 2015)
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/wordnet-3.0-format-security.patch, +files/wordnet-3.0-stubs_c.patch,
+  +wordnet-3.0-r4.ebuild, metadata.xml:
+  Fix tcl/tk slotting; bump EAPI=5; fix for format-security
 
   22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -wordnet-3.0-r2.ebuild:
   Remove old.



1.1                  app-dicts/wordnet/wordnet-3.0-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild?rev=1.1&content-type=text/plain

Index: wordnet-3.0-r4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0-r4.ebuild,v 1.1 2015/03/19 14:32:00 jlec Exp $

EAPI=5

inherit autotools eutils flag-o-matic multilib

DESCRIPTION="A lexical database for the English language"
HOMEPAGE="http://wordnet.princeton.edu/"
SRC_URI="
	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
	mirror://gentoo/${P}-patchset-1.tar.bz2"
LICENSE="Princeton"

SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc"

# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
DEPEND="
	dev-lang/tcl:0=
	dev-lang/tk:0="
RDEPEND="${DEPEND}"

S="${WORKDIR}/WordNet-${PV}"

PATCHES=(
	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
	"${WORKDIR}/${P}-dict-location.patch"
	# Fixes bug 130024, make an additional shared lib
	"${WORKDIR}/${P}-shared-lib.patch"
	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
	"${WORKDIR}/${P}-docs-path.patch"
	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491

	"${FILESDIR}"/${P}-tcl8.6.patch
	"${FILESDIR}"/${P}-format-security.patch
	"${FILESDIR}"/${P}-stubs_c.patch
)
src_prepare() {
	epatch ${PATCHES[@]}
	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
	if ! use doc; then
		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
	fi

	# Drop installation of OLD tk.h headers #255590
	sed '/^SUBDIRS/d' -i include/Makefile.am || die
	sed 's: include/tk/Makefile::' -i configure.ac || die
	rm -rf include/tk/ || die

	rm -f configure || die
	eautoreconf
	MAKEOPTS+=" -e"
}

src_configure() {
	append-cppflags -DUNIX -I"${T}"/usr/include

	PLATFORM=linux WN_ROOT="${T}/usr" \
	WN_DICTDIR="${T}/usr/share/wordnet/dict" \
	WN_MANDIR="${T}/usr/share/man" \
	WN_DOCDIR="${T}/usr/share/doc/wordnet-${PV}" \
	WNHOME="${EPREFIX}/usr/share/wordnet" \
	econf \
		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
		--with-tk="${EPREFIX}"/usr/$(get_libdir)
}