Fix LICENSE from GPL-2 to openssl. Fix econf argument --without-crypto to --without-openssl. basically rewrite the ebuild for cleanup, the intresting stuff is in ChangeLog for users

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 31 insertions, 66 deletions

diff --git a/net-analyzer/ssldump/ChangeLog b/net-analyzer/ssldump/ChangeLog
index 8f4938bde01a..6d9627edc4c4 100644
--- a/net-analyzer/ssldump/ChangeLog
+++ b/net-analyzer/ssldump/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ssldump
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.20 2008/11/07 10:21:34 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.21 2011/01/18 18:19:33 ssuominen Exp $
+
+  18 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> ssldump-0.9-r1.ebuild:
+  Fix LICENSE from GPL-2 to openssl. Fix econf argument --without-crypto to
+  --without-openssl.
 
   07 Nov 2008; Raúl Porcel <armin76@gentoo.org> ssldump-0.9-r1.ebuild:
   sparc stable wrt #244232
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index ec0719d73d4b..465709038563 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -3,7 +3,6 @@ AUX ssldump-0.9-configure-dylib.patch 327 RMD160 c657a76dd4286256d65a7e3e649a3e4
 AUX ssldump-0.9-libpcap-header.patch 246 RMD160 0c38f12cd0fa23a10d3e4fc6a8d548a5ec352d05 SHA1 9440310b0f3435781f365c0394e11f3aa1e1c396 SHA256 942d1b1620ed49463d2b9359ae16d0083325408e40bb360c328dcce4ee50f1fd
 AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 626 RMD160 88f375d073b951108c1cdf16e71ff4dde263d83e SHA1 330c45882729eea8628647d5ad603dcb8c95b672 SHA256 c0fa3dc3cea2872178e883d939c92d084a02458edfebeb4f2aaed0d32160ab63
 DIST ssldump-0.9b3.tar.gz 137435 RMD160 941cf8f2ef8459ec4f9ce65772e134505d46566f SHA1 a633a9a811a138eac5ed440d583473b644135ef5 SHA256 6422c16718d27c270bbcfcc1272c4f9bd3c0799c351f1d6dd54fdc162afdab1e
-EBUILD ssldump-0.9-r1.ebuild 1068 RMD160 a49637c81ec5f51b8c876c21fc0b38919e51bd18 SHA1 871f8a81b33439cccb486be61e1a110d80ef5823 SHA256 bd775519e7c9a2c33a914e6b52bc023539b0ba40a2b1de955a56e991c1b5ff8c
-EBUILD ssldump-0.9.ebuild 963 RMD160 f9b9510612133b740a7698163401c162717acd1e SHA1 29fbab4c225b89c539d64445769c2dd4d4cb6b89 SHA256 c327dac8038541ad980d74ce7a09ee19c29d807ace6194eab3f43ed0b47dd203
-MISC ChangeLog 2484 RMD160 dc685bb1d919dd3f03e8fd197acd0c87a588a2f0 SHA1 220919aa2d83015174f7fa5fca95ff5f89e6975d SHA256 1c897421a1e68febbb5021398c25512a9c69ccc72541f928f99496c02b3e9b0a
+EBUILD ssldump-0.9-r1.ebuild 1022 RMD160 3b3357fcec118d3457877aeaaee146c60fe9de7e SHA1 32ba99cf8ffd28085c1fdb90c94fbd66a39aec5c SHA256 c6bdc1d12abcbecba686d9f1b72b7c898be21fd86cb56823ade651c46fb41f54
+MISC ChangeLog 2661 RMD160 84ff8da0b9f2d5fa0e6adfc97b658c1a98be901e SHA1 1d5e320ff73375ab701c3bf61deb05455a49870b SHA256 9dea4623b142919fd22d089764dc8f54f03d556712abec9851e4f294b81d6783
 MISC metadata.xml 245 RMD160 f1d049e617f898a986a683fe58eed04a95c743e6 SHA1 c65b7f2884eb28392358f234fd40d313a5112f18 SHA256 ad9d4f8a55c8a1eaadcfa8d2fff0ac3a302530ab91a80972c1e0b30666a719f6
diff --git a/net-analyzer/ssldump/ssldump-0.9-r1.ebuild b/net-analyzer/ssldump/ssldump-0.9-r1.ebuild
index 9b9f6dc8f53b..6f8a7738c299 100644
--- a/net-analyzer/ssldump/ssldump-0.9-r1.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9-r1.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9-r1.ebuild,v 1.4 2008/11/07 10:21:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9-r1.ebuild,v 1.5 2011/01/18 18:19:33 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 MY_P=${PN}-0.9b3
+
 DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="http://www.rtfm.com/ssldump/${MY_P}.tar.gz"
 HOMEPAGE="http://www.rtfm.com/ssldump/"
-IUSE="ssl"
+SRC_URI="http://www.rtfm.com/ssldump/${MY_P}.tar.gz"
 
+LICENSE="openssl"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-LICENSE="GPL-2"
+IUSE="ssl"
 
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
+RDEPEND="net-libs/libpcap
+	ssl? ( >=dev-libs/openssl-1 )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A} ; cd ${S}
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpcap-header.patch \
+		"${FILESDIR}"/${P}-configure-dylib.patch \
+		"${FILESDIR}"/${P}-openssl-0.9.8.compile-fix.patch \
+		"${FILESDIR}"/${P}-DLT_LINUX_SLL.patch
 
-	epatch "${FILESDIR}/${P}"-libpcap-header.patch
-	epatch "${FILESDIR}/${P}"-configure-dylib.patch
-	epatch "${FILESDIR}/${P}"-openssl-0.9.8.compile-fix.patch
-	epatch "${FILESDIR}/${P}"-DLT_LINUX_SLL.patch
-	eautoreconf # fixes compiler detection
+	eautoreconf
 }
 
-src_compile() {
-	econf $(use_with ssl crypto)
-	emake || die
+src_configure() {
+	local myconf
+	use ssl || myconf="--without-openssl"
+
+	econf ${myconf}
 }
 
 src_install() {
-	into /usr
 	dosbin ssldump || die
 	doman ssldump.1 || die
-	dodoc COPYRIGHT CREDITS README FILES VERSION INSTALL ChangeLog
+	dodoc ChangeLog CREDITS README
 }
diff --git a/net-analyzer/ssldump/ssldump-0.9.ebuild b/net-analyzer/ssldump/ssldump-0.9.ebuild
deleted file mode 100644
index a65f961621b9..000000000000
--- a/net-analyzer/ssldump/ssldump-0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9.ebuild,v 1.16 2008/02/06 21:12:19 grobian Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-MY_P=${PN}-0.9b3
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A Tool for network monitoring and data acquisition"
-SRC_URI="http://www.rtfm.com/ssldump/${MY_P}.tar.gz"
-HOMEPAGE="http://www.rtfm.com/ssldump/"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-2"
-
-DEPEND="net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-0.6.9 )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch "${FILESDIR}/${P}"-libpcap-header.patch
-	epatch "${FILESDIR}/${P}"-configure-dylib.patch
-	epatch "${FILESDIR}/${P}"-openssl-0.9.8.compile-fix.patch
-}
-
-src_compile() {
-
-	econf `use_with ssl crypto` || die
-	emake || die
-}
-
-src_install() {
-	into /usr
-	dosbin ssldump
-	doman ssldump.1
-	dodoc COPYRIGHT CREDITS README FILES VERSION INSTALL ChangeLog
-}