From bd5ae284e18fb53b2e91f08f904b508d89148dbb Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Mon, 19 Mar 2012 07:24:58 +0000 Subject: Add patch to build _snackmodule.so #395275 (Portage version: 2.2.0_alpha90/cvs/Linux x86_64) --- dev-libs/newt/ChangeLog | 10 +++- dev-libs/newt/files/newt-0.52.14-snack.patch | 21 ++++++++ dev-libs/newt/newt-0.52.14-r1.ebuild | 79 ++++++++++++++++++++++++++++ dev-libs/newt/newt-0.52.14.ebuild | 78 --------------------------- 4 files changed, 108 insertions(+), 80 deletions(-) create mode 100644 dev-libs/newt/files/newt-0.52.14-snack.patch create mode 100644 dev-libs/newt/newt-0.52.14-r1.ebuild delete mode 100644 dev-libs/newt/newt-0.52.14.ebuild (limited to 'dev-libs/newt') diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog index 13b4361a9e53..ff0a2eb18a7e 100644 --- a/dev-libs/newt/ChangeLog +++ b/dev-libs/newt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/newt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.78 2011/11/28 02:13:39 naota Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.79 2012/03/19 07:24:58 naota Exp $ + +*newt-0.52.14-r1 (19 Mar 2012) + + 19 Mar 2012; Naohiro Aota +files/newt-0.52.14-snack.patch, + +newt-0.52.14-r1.ebuild, -newt-0.52.14.ebuild: + Add patch to build _snackmodule.so #395275 *newt-0.52.14 (28 Nov 2011) diff --git a/dev-libs/newt/files/newt-0.52.14-snack.patch b/dev-libs/newt/files/newt-0.52.14-snack.patch new file mode 100644 index 000000000000..9242abb49817 --- /dev/null +++ b/dev-libs/newt/files/newt-0.52.14-snack.patch @@ -0,0 +1,21 @@ +diff -Naur newt-0.52.14.orig/Makefile.in newt-0.52.14/Makefile.in +--- newt-0.52.14.orig/Makefile.in 2011-11-11 20:00:15.000000000 +0900 ++++ newt-0.52.14/Makefile.in 2011-12-19 23:56:43.189480533 +0900 +@@ -79,11 +79,12 @@ + _snackmodule.so: snackmodule.c $(LIBNEWTSH) + [ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \ + mkdir -p $$ver ;\ +- PCFLAGS=`$$ver-config --cflags`; \ +- PIFLAGS=`$$ver-config --includes`; \ +- PLDFLAGS=`$$ver-config --ldflags`; \ +- PLFLAGS=`$$ver-config --libs`; \ +- $(CC) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ ++ PYTHON_CONFIG="$${ver/python/python-config-}"; \ ++ PCFLAGS="`$$PYTHON_CONFIG --cflags`"; \ ++ PIFLAGS=`$$PYTHON_CONFIG --includes`; \ ++ PLDFLAGS=`$$PYTHON_CONFIG --ldflags`; \ ++ PLFLAGS=`$$PYTHON_CONFIG --libs`; \ ++ $(CC) $(SHCFLAGS) $(CFLAGS) $(CPPFLAGS) $$PIFLAGS $$PCFLAGS -c -o $$ver/snackmodule.o snackmodule.c ;\ + $(CC) --shared $$PLDFLAGS $$PLFLAGS $(LDFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L. -lnewt $(LIBS);\ + done || : + touch $@ diff --git a/dev-libs/newt/newt-0.52.14-r1.ebuild b/dev-libs/newt/newt-0.52.14-r1.ebuild new file mode 100644 index 000000000000..d37e53546b9d --- /dev/null +++ b/dev-libs/newt/newt-0.52.14-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.14-r1.ebuild,v 1.1 2012/03/19 07:24:58 naota Exp $ + +EAPI="3" +PYTHON_DEPEND="2" + +inherit eutils multilib python autotools + +DESCRIPTION="Redhat's Newt windowing toolkit development files" +HOMEPAGE="https://fedorahosted.org/newt/" +SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="gpm tcl nls" + +RDEPEND="=sys-libs/slang-2* + >=dev-libs/popt-1.6 + elibc_uclibc? ( sys-libs/ncurses ) + gpm? ( sys-libs/gpm ) + tcl? ( =dev-lang/tcl-8.5* ) + " + +DEPEND="${RDEPEND}" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # bug 73850 + if use elibc_uclibc; then + sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die + fi + + sed -i Makefile.in \ + -e 's|-ltcl8.4|-ltcl8.5|g' \ + -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \ + -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \ + -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \ + -e 's|instroot|DESTDIR|g' \ + -e 's| make | $(MAKE) |g' \ + || die "sed Makefile.in" + + epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch \ + "${FILESDIR}"/${P}-snack.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_with gpm gpm-support) \ + $(use_with tcl) \ + $(use_enable nls) +} + +src_compile() { + emake PYTHONVERS="$(PYTHON)" || die "emake failed" +} + +src_install () { + emake \ + DESTDIR="${D}" \ + PYTHONVERS="$(PYTHON)" \ + install || die "make install failed" + dodoc peanuts.py popcorn.py tutorial.sgml + doman whiptail.1 +} + +pkg_postinst() { + python_mod_optimize snack.py +} + +pkg_postrm() { + python_mod_cleanup snack.py +} diff --git a/dev-libs/newt/newt-0.52.14.ebuild b/dev-libs/newt/newt-0.52.14.ebuild deleted file mode 100644 index 990c66d3bfcc..000000000000 --- a/dev-libs/newt/newt-0.52.14.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.14.ebuild,v 1.1 2011/11/28 02:13:40 naota Exp $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit eutils multilib python autotools - -DESCRIPTION="Redhat's Newt windowing toolkit development files" -HOMEPAGE="https://fedorahosted.org/newt/" -SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="gpm tcl nls" - -RDEPEND="=sys-libs/slang-2* - >=dev-libs/popt-1.6 - elibc_uclibc? ( sys-libs/ncurses ) - gpm? ( sys-libs/gpm ) - tcl? ( =dev-lang/tcl-8.5* ) - " - -DEPEND="${RDEPEND}" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # bug 73850 - if use elibc_uclibc; then - sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die - fi - - sed -i Makefile.in \ - -e 's|-ltcl8.4|-ltcl8.5|g' \ - -e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \ - -e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \ - -e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \ - -e 's|instroot|DESTDIR|g' \ - -e 's| make | $(MAKE) |g' \ - || die "sed Makefile.in" - - epatch "${FILESDIR}"/${PN}-0.52.13-gold.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_with gpm gpm-support) \ - $(use_with tcl) \ - $(use_enable nls) -} - -src_compile() { - emake PYTHONVERS="$(PYTHON)" || die "emake failed" -} - -src_install () { - emake \ - DESTDIR="${D}" \ - PYTHONVERS="$(PYTHON)" \ - install || die "make install failed" - dodoc peanuts.py popcorn.py tutorial.sgml - doman whiptail.1 -} - -pkg_postinst() { - python_mod_optimize snack.py -} - -pkg_postrm() { - python_mod_cleanup snack.py -} -- cgit v1.2.3-65-gdbad