[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpa/files/, x11-libs/xpa/
commit: 76b33c54c4ad71002f065a5b89982601e76befb4 Author: David Seifert gentoo org> AuthorDate: Sat Mar 20 11:32:41 2021 + Commit: David Seifert gentoo org> CommitDate: Sat Mar 20 11:32:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b33c54 x11-libs/xpa: Port to EAPI 7 Closes: https://bugs.gentoo.org/725280 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> x11-libs/xpa/files/xpa-2.1.18-makefile.patch | 44 x11-libs/xpa/xpa-2.1.18.ebuild | 22 +- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch index 34aeed5b39d..1ceb29dbfcb 100644 --- a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch +++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch @@ -1,5 +1,5 @@ a/Makefile.in 2016-12-19 19:21:28.566222982 + -+++ b/Makefile.in 2016-12-19 19:23:23.795246443 + +--- a/Makefile.in b/Makefile.in @@ -28,6 +28,11 @@ prefix = @prefix@ @@ -37,24 +37,33 @@ # Platform-specific X compiler flags (include file specifications) X_CFLAGS =@X_CFLAGS@ -@@ -177,7 +182,7 @@ +@@ -173,12 +178,12 @@ + + $(LIB): $(LIBOBJS) + $(RM) $(LIB) +- ar crv $(LIB) $(LIBOBJS) ++ $(AR) crv $(LIB) $(LIBOBJS) $(RANLIB) $(LIB) shlib:$(LIB) - @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ +- (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ + @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ - (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ ++ (cd lib$(PACKAGE).tmp && $(AR) x ../lib$(PACKAGE).a); \ rm -f lib$(PACKAGE).tmp/xt*.o; \ rm -f lib$(PACKAGE).tmp/tcl*.o; \ -@@ -193,7 +198,7 @@ + CC='$(CC)' CXX=$(CXX) \ +@@ -193,8 +198,8 @@ -lwsock32 tclxpa: $(LIB) - @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ +- (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ + @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ - (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ ++ (cd libtclxpa.tmp && $(AR) x ../lib$(PACKAGE).a); \ rm -f libtclxpa.tmp/xt*.o; \ CC='$(CC)' CXX=$(CXX) \ + ./mklib -o tclxpa libtclxpa.tmp/*.o $(TCL_LIBS); \ @@ -275,7 +280,7 @@ do \ if [ ! -d $$i ] ; then \ @@ -108,3 +117,26 @@ cp -p -R ./man/* $(DISTDIR)/man/.) release: dist +--- a/mklib b/mklib +@@ -211,9 +211,9 @@ + if [ "x$LINK" = "x" ] ; then + # -linker was not specified so set default link command now + if [ $CPLUSPLUS = 1 ] ; then +-LINK=g++ ++LINK=${CXX} + else +-LINK=gcc ++LINK=${CC} + fi + fi + +@@ -248,7 +248,7 @@ + elif [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" # prefix with "lib", suffix with ".a" + echo "mklib: Making" $ARCH "static library: " ${LIBNAME} +-LINK="ar" ++LINK="${AR}" + OPTS="-ru" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild index 623d26c3198..984f56d2241 100644 --- a/x11-libs/xpa/xpa-2.1.18.ebuild +++ b/x11-libs/xpa/xpa-2.1.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils autotools +inherit autotools toolchain-funcs DESCRIPTION="Messaging system providing communication between programs" HOMEPAGE="https://github.com/ericmandel/xpa; @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-2.1" SLOT="0/1" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc static-libs" +IUSE="doc" RDEPEND=" dev-lang/tcl:0= @@ -26,12 +26,13 @@ PATCHES=( src_prepare() { default - sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" \ - -i mklib || die + sed -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" -i mklib || die eautoconf } src_configure() { + tc-export AR CC + econf \ --enable-shared \ --enable-threaded-xpans \ @@ -47,11 +48,16 @@ src_compile() { src_install() { dodir /usr/$(get_libdir) emake INSTALL_ROOT="${D}" install + insinto /usr/$(get_libdir)/tclxpa doins pkgIndex.tcl - mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ + + mv "${ED}"/usr/$(get_libdir)/libtclxpa* \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpa/files/
commit: 87dd3f5ec9b0e080f39f23447adb0b1921cd92c4 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Jan 25 09:28:02 2021 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Jan 25 15:00:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87dd3f5e x11-libs/xpa: remove unused patch Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19211 Signed-off-by: Aaron Bauman gentoo.org> x11-libs/xpa/files/xpa-2.1.8-makefile.patch | 84 - 1 file changed, 84 deletions(-) diff --git a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch deleted file mode 100644 index 290309662bb..000 --- a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch +++ /dev/null @@ -1,84 +0,0 @@ Makefile.in.orig 2008-11-03 12:05:33.0 + -+++ Makefile.in2008-11-03 12:07:48.0 + -@@ -28,6 +28,11 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+libdir = @libdir@ -+datadir = @datadir@ -+mandir = @mandir@ -+includedir = @includedir@ - - # The following definition can be set to non-null for special systems - # like AFS with replication. It allows the pathnames used for installation -@@ -37,19 +42,19 @@ - INSTALL_ROOT = - - # Directory in which to install the .a or .so binary for the XPA library: --LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib -+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) - - # Directory in which to install the program wish: --BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin -+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) - - # Directory in which to install the include file xpa.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) - - # Top-level directory for manual entries: --MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) - - # Top-level directory for share entries: --MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa -+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa - - # Platform-specific X compiler flags (include file specifications) - X_CFLAGS =@X_CFLAGS@ -@@ -175,7 +180,7 @@ - $(RANLIB) $(LIB) - - shlib:$(LIB) -- @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ -+ @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ - (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ - rm -f lib$(PACKAGE).tmp/xt*.o; \ - rm -f lib$(PACKAGE).tmp/tcl*.o; \ -@@ -184,7 +189,7 @@ - rm -rf lib$(PACKAGE).tmp) - - tclxpa: $(LIB) -- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ -+ @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ - (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ - rm -f libtclxpa.tmp/xt*.o; \ - CC='$(CC)' CXX=$(CXX) \ -@@ -259,7 +264,7 @@ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -- mkdir $$i; \ -+ mkdir -p $$i; \ - chmod 755 $$i; \ - else true; \ - fi; \ -@@ -281,7 +286,7 @@ - install-man: - @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ - echo "Making directory $(MAN_INSTALL_DIR)"; \ -- mkdir $(MAN_INSTALL_DIR); \ -+ mkdir -p $(MAN_INSTALL_DIR); \ - chmod 755 $(MAN_INSTALL_DIR); \ - else true; \ - fi; -@@ -292,7 +297,7 @@ - M="$(MAN_INSTALL_DIR)/man$$E"; \ - if [ ! -d $$M ] ; then \ - echo "Making directory $$M"; \ -- mkdir $$M; \ -+ mkdir -p $$M; \ - chmod 755 $$M; \ - else true; \ - fi; \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpa/, x11-libs/xpa/files/
commit: 748fc25d0e2d4c2f05d888bce4ade841383202e0 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jun 24 16:07:10 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jun 24 16:21:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748fc25d x11-libs/xpa: Fix building (#637346 by Matt Hartley) Package-Manager: Portage-2.3.40, Repoman-2.3.9 x11-libs/xpa/files/xpa-2.1.18-include.patch | 14 ++ x11-libs/xpa/xpa-2.1.18.ebuild | 7 +-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/x11-libs/xpa/files/xpa-2.1.18-include.patch b/x11-libs/xpa/files/xpa-2.1.18-include.patch new file mode 100644 index 000..f020e1815be --- /dev/null +++ b/x11-libs/xpa/files/xpa-2.1.18-include.patch @@ -0,0 +1,14 @@ +diff --git a/tcl.c b/tcl.c +index 1dbdad4..acc8d45 100644 +--- a/tcl.c b/tcl.c +@@ -2,6 +2,9 @@ + *Copyright (c) 1999-2003 Smithsonian Astrophysical Observatory + */ + ++//declares uintptr_t ++#include ++ + #include + + #if HAVE_TCL diff --git a/x11-libs/xpa/xpa-2.1.18.ebuild b/x11-libs/xpa/xpa-2.1.18.ebuild index 45e6b4b73df..7a48a43e10e 100644 --- a/x11-libs/xpa/xpa-2.1.18.ebuild +++ b/x11-libs/xpa/xpa-2.1.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,10 @@ RDEPEND=" x11-libs/libXt:0" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-2.1.18-makefile.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.1.18-makefile.patch + "${FILESDIR}"/${PN}-2.1.18-include.patch #637346 +) src_prepare() { default
[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpa/files/, x11-libs/xpa/
commit: 7b53ff123aa3db09df84d7a277fcae9d1d95e0d1 Author: Sébastien Fabbro gentoo org> AuthorDate: Mon Dec 19 19:25:40 2016 + Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Dec 19 23:51:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b53ff12 x11-libs/xpa: version bump Package-Manager: portage-2.3.3 x11-libs/xpa/Manifest| 1 + x11-libs/xpa/files/xpa-2.1.18-makefile.patch | 110 +++ x11-libs/xpa/metadata.xml| 29 +++ x11-libs/xpa/xpa-2.1.18.ebuild | 55 ++ 4 files changed, 182 insertions(+), 13 deletions(-) diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest index a4280b7..70a59d8 100644 --- a/x11-libs/xpa/Manifest +++ b/x11-libs/xpa/Manifest @@ -1,2 +1,3 @@ DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f DIST xpa-2.1.17.tar.gz 900465 SHA256 c95ae1d6c5353226a90f29007822e98da42a036af2f7326a21d2f66189c49751 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50 WHIRLPOOL 7426629091bc73d82ea87ce3db64b6f18f98f47bf98a45cc89971dbd0a88b44ee9eabe3e34e645e62a046fdb5b84258668f04616c38a34482f061e59b85445fb +DIST xpa-2.1.18.tar.gz 900579 SHA256 a8c9055b913204babce2de4fa037bc3a5849941dcb888f57368fd04af0aa787b SHA512 4482325338ed15b70a1a934d8ba848712a4eed7546b4197fc89baa93dc80df1be29170a7350453f176d45264fae6f0474d136e487c0239d9e97dbd09dd8d0b19 WHIRLPOOL aa195e0121b3a5966932a796a3a67a5900b687f34507de4ac41c7d3cff37371497be0fffdc314be69a1dffa99cb9d17abd75a93659cce3b5a0d47ff9137c0802 diff --git a/x11-libs/xpa/files/xpa-2.1.18-makefile.patch b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch new file mode 100644 index ..34aeed5 --- /dev/null +++ b/x11-libs/xpa/files/xpa-2.1.18-makefile.patch @@ -0,0 +1,110 @@ +--- a/Makefile.in 2016-12-19 19:21:28.566222982 + b/Makefile.in 2016-12-19 19:23:23.795246443 + +@@ -28,6 +28,11 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++bindir = @bindir@ ++libdir = @libdir@ ++datadir = @datadir@ ++mandir = @mandir@ ++includedir = @includedir@ + + # The following definition can be set to non-null for special systems + # like AFS with replication. It allows the pathnames used for installation +@@ -37,19 +42,19 @@ + INSTALL_ROOT = + + # Directory in which to install the .a or .so binary for the XPA library: +-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib ++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) + + # Directory in which to install the program wish: +-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin ++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) + + # Directory in which to install the include file xpa.h: +-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include ++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) + + # Top-level directory for manual entries: +-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man ++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) + + # Top-level directory for share entries: +-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa ++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa + + # Platform-specific X compiler flags (include file specifications) + X_CFLAGS =@X_CFLAGS@ +@@ -177,7 +182,7 @@ + $(RANLIB) $(LIB) + + shlib:$(LIB) +- @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \ ++ @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \ + (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \ + rm -f lib$(PACKAGE).tmp/xt*.o; \ + rm -f lib$(PACKAGE).tmp/tcl*.o; \ +@@ -193,7 +198,7 @@ + -lwsock32 + + tclxpa: $(LIB) +- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \ ++ @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \ + (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \ + rm -f libtclxpa.tmp/xt*.o; \ + CC='$(CC)' CXX=$(CXX) \ +@@ -275,7 +280,7 @@ + do \ + if [ ! -d $$i ] ; then \ + echo "Making directory $$i"; \ +- mkdir $$i; \ ++ mkdir -p $$i; \ + chmod 755 $$i; \ + else true; \ + fi; \ +@@ -297,7 +302,7 @@ + install-man: + @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ + echo "Making directory $(MAN_INSTALL_DIR)"; \ +- mkdir $(MAN_INSTALL_DIR); \ ++ mkdir -p $(MAN_INSTALL_DIR); \ +
[gentoo-commits] repo/gentoo:master commit in: x11-libs/xpa/
commit: ef6e588bd4162c4019914fc23871b9ee1709a170 Author: Sébastien Fabbro gentoo org> AuthorDate: Tue Feb 23 21:38:27 2016 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Feb 23 21:43:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6e588b x11-libs/xpa: Version bump Package-Manager: portage-2.2.27 x11-libs/xpa/Manifest | 1 + x11-libs/xpa/xpa-2.1.17.ebuild | 54 ++ 2 files changed, 55 insertions(+) diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest index 4f98332..a4280b7 100644 --- a/x11-libs/xpa/Manifest +++ b/x11-libs/xpa/Manifest @@ -1 +1,2 @@ DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f +DIST xpa-2.1.17.tar.gz 900465 SHA256 c95ae1d6c5353226a90f29007822e98da42a036af2f7326a21d2f66189c49751 SHA512 c9742b8427a9d8512a429f5a3b2bc6a55803b975c1524ead64906a4387a589f229e8715c46814b7b1bfb30a05f2f5fe59e944e1dabc333fcceca71c569a05a50 WHIRLPOOL 7426629091bc73d82ea87ce3db64b6f18f98f47bf98a45cc89971dbd0a88b44ee9eabe3e34e645e62a046fdb5b84258668f04616c38a34482f061e59b85445fb diff --git a/x11-libs/xpa/xpa-2.1.17.ebuild b/x11-libs/xpa/xpa-2.1.17.ebuild new file mode 100644 index 000..6c93fa4 --- /dev/null +++ b/x11-libs/xpa/xpa-2.1.17.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools + +DESCRIPTION="Messaging system providing communication between programs" +HOMEPAGE="https://github.com/ericmandel/xpa; +SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/1" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc static-libs" + +RDEPEND=" + dev-lang/tcl:0= + x11-libs/libXt:0" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch + sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die + eautoconf +} + +src_configure() { + econf \ + --enable-shared \ + --enable-threaded-xpans \ + --with-x \ + --with-tcl \ + --with-threads +} + +src_compile() { + emake shlib tclxpa +} + +src_install () { + dodir /usr/$(get_libdir) + emake INSTALL_ROOT="${D}" install + insinto /usr/$(get_libdir)/tclxpa + doins pkgIndex.tcl + mv "${ED}"/usr/$(get_libdir)/libtclxpa* \ + "${ED}"/usr/$(get_libdir)/tclxpa/ || die + dodoc README + use doc && dodoc doc/*.pdf && dohtml doc/*.html + # build system so crappy not worth patching to a non respondant upstream + # and builds static with PIC + use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a +}