Rename invalid USE flag "openssl" to "ssl".

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

5 files changed, 14 insertions, 47 deletions

diff --git a/net-p2p/mktorrent/ChangeLog b/net-p2p/mktorrent/ChangeLog
index 223ee4652e78..581c3772cbea 100644
--- a/net-p2p/mktorrent/ChangeLog
+++ b/net-p2p/mktorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mktorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/ChangeLog,v 1.7 2010/04/20 21:08:47 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/ChangeLog,v 1.8 2010/10/06 13:11:39 ssuominen Exp $
+
+  06 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> -mktorrent-0.7.ebuild,
+  mktorrent-1.0.ebuild, metadata.xml:
+  Rename invalid USE flag "openssl" to "ssl".
 
 *mktorrent-1.0 (20 Apr 2010)
 
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index 03e9288d3812..f566f7428070 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,8 +1,6 @@
 DIST mktorrent-0.4.tar.gz 16688 RMD160 3c09fc95857e2b2c4ac741d99e3903f058b31d95 SHA1 e4ab170e04ac10c06af39d8252418e45728599c8 SHA256 d529a71ea3ce2b8caa7170eaed70d006511d25fbd0ffa90a1709da08cd76128a
-DIST mktorrent-0.7.tar.gz 23003 RMD160 e7b8aed476d7c40f38db06e1e30d1d826a0348db SHA1 924b4c031200d771b1452e0911e95492b991b78c SHA256 7d94cc48ee13efaa6455a063f11827f18008d80c8fcfc5b7dc5348882ee322b3
 DIST mktorrent-1.0.tar.gz 23089 RMD160 ad8e2fb603635356b01b9d5eb30c57a6f01b0656 SHA1 f9b1bbf9d19911b6c8994dbec6208530c7d929ad SHA256 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f
 EBUILD mktorrent-0.4.ebuild 717 RMD160 c85c35a186dfe7090b7cab98131eaae89054e606 SHA1 bddcf2182e0ceaa124051db1a151af5de51748ee SHA256 5f46dab57ac12d93b6d904d49dac9e90fa1c1603a0239e25f6bb3c520d1a04f8
-EBUILD mktorrent-0.7.ebuild 959 RMD160 cda8a28c51cd27e5b851ff7e012082c92288c3ea SHA1 a81b4839784219702c23b014a3caeaccf2377ed4 SHA256 d87cdd1dd878d3ef34959b702f7c7a1f34365f5fb98e0f74c2bc8d9950d9074b
-EBUILD mktorrent-1.0.ebuild 954 RMD160 850c7bd2ad277100f592607982c98a91703161aa SHA1 70608651c3f276cacbaa3ef7720b65f22fe6205b SHA256 ede61568b2b556ecb6371425a70968e23b270eb4073813da3e7ba664953dbba7
-MISC ChangeLog 1282 RMD160 614a72a615cc966a00c03e7ed9ec1e0eb1451e34 SHA1 b2772aefaca8d44d8f66368e9cea8576ddae8844 SHA256 0ab63d9a16d4f5458d2717f207b5ba46abd05499967f48d5b3a36edbc61a3056
-MISC metadata.xml 313 RMD160 0f3c9ea0bb55b000ce14d113216fe77dd261f246 SHA1 67019b8f6f35a3fe54ecd0eedc1ffcee411a1443 SHA256 95551a66b1e468bc4a1113f8b79d0577073449340a03463f47802c8d31297b8b
+EBUILD mktorrent-1.0.ebuild 947 RMD160 e805eb8961030fb69dcc8e7a85ec0c772f444606 SHA1 b091ab64604961e6a392a0576d008594e7f18569 SHA256 9b090d7ee48f63640a0d0f5a760ab310e39f1ad4fd691b5bec531086355bd4a6
+MISC ChangeLog 1442 RMD160 2579c1914119f2080cc3d59ffbbbbfbd7e76f693 SHA1 3d3e44e7e3b62a3e58f310858690694d048cba8f SHA256 34e6add5393bb9427b870c515936d74f3087d17513517d3df4a79b55fe06e904
+MISC metadata.xml 247 RMD160 b051b3e1a4ad11ac9d743fb9de3373296894280d SHA1 ec3f12769962897c7e2f9791dd5887ca7a2b6074 SHA256 3d185c104ccc94f1a1e0ea3db0a70e80e4e75dfc0d36b4c0efdafd46737c20d9
diff --git a/net-p2p/mktorrent/metadata.xml b/net-p2p/mktorrent/metadata.xml
index f4ec5e826b1e..13c9d77da193 100644
--- a/net-p2p/mktorrent/metadata.xml
+++ b/net-p2p/mktorrent/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>net-p2p</herd>
 <use>
-	<flag name='openssl'>Use OpenSSL for md5 and sha1 support</flag>
 	<flag name='largefile'>Enable largefile support on 32 bit systems</flag>
 </use>
 </pkgmetadata>
diff --git a/net-p2p/mktorrent/mktorrent-0.7.ebuild b/net-p2p/mktorrent/mktorrent-0.7.ebuild
deleted file mode 100644
index 494f1bdbdf2b..000000000000
--- a/net-p2p/mktorrent/mktorrent-0.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/mktorrent-0.7.ebuild,v 1.1 2009/08/17 18:19:01 rbu Exp $
-
-EAPI=1
-inherit toolchain-funcs
-
-DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
-HOMEPAGE="http://mktorrent.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads +largefile +openssl debug"
-
-RDEPEND="openssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	tc-export CC
-	MAKEPARAM="USE_LONG_OPTIONS=1 DONT_STRIP=1"
-	use debug && MAKEPARAM="${MAKEPARAM} DEBUG=1"
-	use largefile && MAKEPARAM="${MAKEPARAM} USE_LARGE_FILES=1"
-	use openssl && MAKEPARAM="${MAKEPARAM} USE_OPENSSL=1"
-	use threads && MAKEPARAM="${MAKEPARAM} USE_PTHREADS=1"
-
-	emake ${MAKEPARAM} || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/net-p2p/mktorrent/mktorrent-1.0.ebuild b/net-p2p/mktorrent/mktorrent-1.0.ebuild
index 49d35f4bc40a..dc6fbe2fdd3f 100644
--- a/net-p2p/mktorrent/mktorrent-1.0.ebuild
+++ b/net-p2p/mktorrent/mktorrent-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/mktorrent-1.0.ebuild,v 1.2 2010/04/20 21:16:21 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent/mktorrent-1.0.ebuild,v 1.3 2010/10/06 13:11:39 ssuominen Exp $
 
 EAPI=1
 inherit toolchain-funcs
@@ -12,9 +12,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="threads +largefile +openssl debug"
+IUSE="threads +largefile +ssl debug"
 
-RDEPEND="openssl? ( dev-libs/openssl )"
+RDEPEND="ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}"
 
 src_compile() {
@@ -22,13 +22,13 @@ src_compile() {
 	MAKEPARAM="USE_LONG_OPTIONS=1"
 	use debug && MAKEPARAM="${MAKEPARAM} DEBUG=1"
 	use largefile && MAKEPARAM="${MAKEPARAM} USE_LARGE_FILES=1"
-	use openssl && MAKEPARAM="${MAKEPARAM} USE_OPENSSL=1"
+	use ssl && MAKEPARAM="${MAKEPARAM} USE_OPENSSL=1"
 	use threads && MAKEPARAM="${MAKEPARAM} USE_PTHREADS=1"
 
 	emake ${MAKEPARAM} || die "emake failed."
 }
 
 src_install() {
-	dobin ${PN}
+	dobin ${PN} || die
 	dodoc README
 }