diff options
author | Andrew Savchenko <bircoph@gentoo.org> | 2015-07-15 09:48:27 +0000 |
---|---|---|
committer | Andrew Savchenko <bircoph@gentoo.org> | 2015-07-15 09:48:27 +0000 |
commit | ab2a4fbb874a015b4b38256b95928182288c09bc (patch) | |
tree | f4ad04717bb2e54659cd8a76247cb1be63072dda /net-proxy | |
parent | version bump, fix build with kpathsea from texlive 2015 (diff) | |
download | gentoo-2-ab2a4fbb874a015b4b38256b95928182288c09bc.tar.gz gentoo-2-ab2a4fbb874a015b4b38256b95928182288c09bc.tar.bz2 gentoo-2-ab2a4fbb874a015b4b38256b95928182288c09bc.zip |
Fix bug 553822, remove old.
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
(Portage version: 2.2.20/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)
Diffstat (limited to 'net-proxy')
-rw-r--r-- | net-proxy/tsocks/ChangeLog | 11 | ||||
-rw-r--r-- | net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild | 60 | ||||
-rw-r--r-- | net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild (renamed from net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild) | 29 |
3 files changed, 27 insertions, 73 deletions
diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog index 58527923594c..d398e1c7c202 100644 --- a/net-proxy/tsocks/ChangeLog +++ b/net-proxy/tsocks/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-proxy/tsocks # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.43 2015/01/09 16:59:58 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.44 2015/07/15 09:48:27 bircoph Exp $ + +*tsocks-1.8_beta5-r8 (15 Jul 2015) + + 15 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> + -tsocks-1.8_beta5-r6.ebuild, -tsocks-1.8_beta5-r7.ebuild, + +tsocks-1.8_beta5-r8.ebuild: + Add multilib support (bug 553822). + Migrate to configure.ac. + Remove old. *tsocks-1.8_beta5-r7 (09 Jan 2015) diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild deleted file mode 100644 index 5a59dfcac155..000000000000 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r6.ebuild,v 1.2 2015/01/08 14:58:40 bircoph Exp $ - -EAPI="5" - -inherit multilib eutils autotools toolchain-funcs - -DESCRIPTION="Transparent SOCKS v4 proxying library" -HOMEPAGE="http://tsocks.sourceforge.net/" -SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz - tordns? ( http://dev.gentoo.org/~naota/patch/${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="tordns" - -S="${WORKDIR}/${P%%_*}" - -src_prepare() { - epatch "${FILESDIR}/${P}-gentoo-r3.patch" - epatch "${FILESDIR}/${P}-bsd.patch" - use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r2.patch" - eautoreconf -} - -src_configure() { - tc-export CC - - # NOTE: the docs say to install it into /lib. If you put it into - # /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't - # mounted in time :-( (Ben Lutgens) <lamer@gentoo.org> - econf \ - --with-conf=/etc/socks/tsocks.conf \ - --libdir=/$(get_libdir) -} - -src_compile() { - # Fix QA notice lack of SONAME - emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} -} - -src_install() { - emake DESTDIR="${D}" install - newbin validateconf tsocks-validateconf - newbin saveme tsocks-saveme - dobin inspectsocks - insinto /etc/socks - doins tsocks.conf.*.example - dodoc FAQ - use tordns && dodoc README* -} - -pkg_postinst() { - einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory" - einfo "The following executables have been renamed:" - einfo " /usr/bin/saveme renamed to tsocks-saveme" - einfo " /usr/bin/validateconf renamed to tsocks-validateconf" -} diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild index 898c0c8f9711..52e87ea49cc5 100644 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild +++ b/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r7.ebuild,v 1.1 2015/01/09 16:59:58 bircoph Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r8.ebuild,v 1.1 2015/07/15 09:48:27 bircoph Exp $ EAPI="5" -inherit autotools eutils multilib toolchain-funcs +inherit autotools eutils multilib multilib-minimal toolchain-funcs DESCRIPTION="Transparent SOCKS v4 proxying library" HOMEPAGE="http://tsocks.sourceforge.net/" @@ -33,10 +33,13 @@ src_prepare() { use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r3.patch" sed -i 's/TSOCKS_CONFFILE/TSOCKS_CONF_FILE/' tsocks.8 || die "sed tsocks.8 failed" + + mv configure.in configure.ac || die eautoreconf + multilib_copy_sources } -src_configure() { +multilib_src_configure() { tc-export CC # NOTE: the docs say to install it into /lib. If you put it into @@ -50,20 +53,22 @@ src_configure() { --libdir=/$(get_libdir) } -src_compile() { +multilib_src_compile() { # Fix QA notice lack of SONAME emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} } -src_install() { +multilib_src_install() { emake DESTDIR="${D}" install - newbin validateconf tsocks-validateconf - newbin saveme tsocks-saveme - dobin inspectsocks - insinto /etc/socks - doins tsocks.conf.*.example - dodoc FAQ - use tordns && dodoc README* + if multilib_is_native_abi; then + newbin validateconf tsocks-validateconf + newbin saveme tsocks-saveme + dobin inspectsocks + insinto /etc/socks + doins tsocks.conf.*.example + dodoc FAQ + use tordns && dodoc README* + fi } pkg_postinst() { |