[gentoo-commits] gentoo-x86 commit in net-misc/sslwrap: ChangeLog sslwrap-2.0.6-r2.ebuild

["Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>]

ssuominen    12/12/02 04:41:01

  Modified:             ChangeLog sslwrap-2.0.6-r2.ebuild
  Log:
  Update .ebuild to meet current requirement(s)
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.25                 net-misc/sslwrap/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	1 Dec 2012 19:37:27 -0000	1.24
+++ ChangeLog	2 Dec 2012 04:41:00 -0000	1.25
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/sslwrap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.24 2012/12/01 19:37:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/ChangeLog,v 1.25 2012/12/02 04:41:00 ssuominen Exp $
+
+  02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> sslwrap-2.0.6-r2.ebuild,
+  +files/sslwrap-2.0.6-build.patch:
+  Update .ebuild to meet current requirement(s)
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org> sslwrap-2.0.6-r1.ebuild,
   sslwrap-2.0.6-r2.ebuild:



1.5                  net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild?r1=1.4&r2=1.5

Index: sslwrap-2.0.6-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sslwrap-2.0.6-r2.ebuild	1 Dec 2012 19:37:27 -0000	1.4
+++ sslwrap-2.0.6-r2.ebuild	2 Dec 2012 04:41:00 -0000	1.5
@@ -1,49 +1,35 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v 1.4 2012/12/01 19:37:27 armin76 Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild,v 1.5 2012/12/02 04:41:00 ssuominen Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="TSL/SSL - Port Wrapper"
 HOMEPAGE="http://www.rickk.com/sslwrap/index.htm"
-SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz
-	mirror://gentoo/${PN}-gentoo.tar.bz2"
+SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="sslwrap"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.6"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${PN}${PV//.}
 
-src_prepare() {
-	sed -i Makefile \
-		-e 's:gcc:$(CC):' \
-		-e 's:/usr/local/ssl/include:/usr/include/openssl:' \
-		|| die "sed Makefile"
-
-	cp -v "${WORKDIR}"/${PN}-gentoo/*.c . || die "cp"
-
-	has_version '=dev-libs/openssl-0.9.7*' \
-		&& epatch "${FILESDIR}/${PV}-openssl-0.9.7.patch"
-
-	sed -i *.h *.c \
-		-e 's:OPENSSL":"openssl\/:g' \
-		-e 's:SSL_OP_NON_EXPORT_FIRST:SSL_OP_CIPHER_SERVER_PREFERENCE:g' \
-		|| die "sed *.h *.c"
+pkg_setup() {
+	tc-export CC
 }
 
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS} ${LDFLAGS}" || die "emake"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
 }
 
 src_install() {
-	dosbin sslwrap
+	dosbin ${PN}
 	dodoc README
-	dohtml -r ./
+	dohtml -r .
 }