Version bump to 2.0.0, remove alpha1 and fix some issues in the live ebuild.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 26 insertions, 34 deletions

diff --git a/dev-libs/libmowgli/ChangeLog b/dev-libs/libmowgli/ChangeLog
index 10cd5db04fa3..a7c97d3ba9fa 100644
--- a/dev-libs/libmowgli/ChangeLog
+++ b/dev-libs/libmowgli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmowgli
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/ChangeLog,v 1.70 2012/04/01 14:38:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/ChangeLog,v 1.71 2012/04/20 00:34:52 jdhore Exp $
+
+*libmowgli-2.0.0 (20 Apr 2012)
+
+  20 Apr 2012; Jeff Horelick <jdhore@gentoo.org> +libmowgli-2.0.0.ebuild,
+  -libmowgli-2.0.0_alpha1.ebuild, libmowgli-9999.ebuild:
+  Version bump to 2.0.0, remove alpha1 and fix some issues in the live ebuild.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> libmowgli-1.0.0.ebuild:
   alpha/sparc stable wrt #407585
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 42f77bb1fefc..b3fecfc5b52f 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libmowgli-0.6.1.tgz 109102 RMD160 352daa998390a4bce708ae659f7599ff01504f46 SHA1 307172a480e5ea1d21f8978fdc3881d9bd889207 SHA256 1454d47cf1d09c9466b4620ef903b62d151075c5c89c15a3bf232466ba7f1d2e
 DIST libmowgli-0.7.0.tbz2 96565 RMD160 4d762d304aaf973cbab6e2ab44d2bbedb58b903a SHA1 6448f4cc2fa0a98992eb24e4b6a431c4c67f348f SHA256 fdd3bb2f576d3a000d9c7406744d6bdc3e2380ed1c242111a67092ec3e0ac3b4
 DIST libmowgli-0.9.50.tar.bz2 105376 RMD160 67714555518a5a6e4232c31ab4ba437999f6c689 SHA1 51cac29a5670561e63dd9346820d61e6fd409e88 SHA256 3ff5be7c91b9e5cae94ab5824b9ed7b56599d7e9be3ff8ae79b2cc9f45bb7671
 DIST libmowgli-0.9.95.tar.bz2 105939 RMD160 e9aac3750045fe98cd03efccf6d6ef26ab0e6e46 SHA1 50d32d4d84f2438382c203bd7c85adc976683c25 SHA256 e1d9c961e24066af0b6c82f28af96f18dcd4c05819984a74d3ec14d07ff8a749
 DIST libmowgli-1.0.0.tar.bz2 105929 RMD160 5365f004f11ca9fcd404e491b2ee186af99b4399 SHA1 cc4a1b330d17c491d6f9c26d7987ca33adc2fa1d SHA256 8ea0dfd606b0ac280747c9a5f93ca940c23c7367dee0776715c87623ae6624fb
-DIST libmowgli-2.0.0-alpha1.tar.gz 136917 RMD160 d3a396be51ec152c34ad776dd2df96cf0076ece5 SHA1 99ef2fd8aca2cf7d434132744f65619c4bcd10da SHA256 8c5efbf621cdc1256a700aa63c78136c0f5e676c11b607df8db089429c6d5389
+DIST libmowgli-2.0.0.tar.gz 200771 RMD160 6003a9594f3837d689ae628c502cd1d8bbe1da4d SHA1 c20a4bff1592910f8f1b6eddbcbac285dfe238bb SHA256 ecbc8568f83dee06316bcf1f2bd4cfa98165e2116f25a5fbb0ef94675e1f02fb
 EBUILD libmowgli-0.6.1.ebuild 739 RMD160 d17006df23927b5879be15ed7da5e0ac2d094204 SHA1 c1074dd8cb5e8bebb60e9315f76e0074cd6b1c64 SHA256 8f3eccf3c7d78beb6fb86ff4e3e67564cfc90d4f441625793668157a67a13383
 EBUILD libmowgli-0.7.0.ebuild 830 RMD160 f7401ab19228edde480ba1d84c3894d9c98e5011 SHA1 e9d69b78367f623ad565cc638931b47d29441f3f SHA256 1bbcd615040e83113ce5b1be09ca60eb58ed10c591bfdd7a8e95125e8ed46be3
 EBUILD libmowgli-0.9.50.ebuild 813 RMD160 5c63d8188a7fe9e1fe7ff82331d91e9b2b15c085 SHA1 14a8fef7c29b2ad6b776350e28b39085818f23ff SHA256 79645e52e2484ed831cedb1aea01fe75654c4c3a7ac35ab5ae0974957c5f8436
 EBUILD libmowgli-0.9.95.ebuild 821 RMD160 0610a8bea256aa924d11fedbf23ce73af9bed3d1 SHA1 df453c9a9c78312c50a8c4b295a28a570253d88b SHA256 4ea56dcd2213f38005d333ce3a1daf901ccb6a0d2d7d7774d7f018d6117a14dc
 EBUILD libmowgli-1.0.0.ebuild 727 RMD160 7078cafca2850b3a950e099eff86aed8f4948840 SHA1 2ec7befc16c9d92e5746fd2d1a533df7ac237901 SHA256 1e3004bd91a31a3e4cd1d59de432fd78a35787cdc9e68aa90a4367a65b99e240
-EBUILD libmowgli-2.0.0_alpha1.ebuild 720 RMD160 5c041f20e1fc30e9bee7394bb31e4d5863ac8373 SHA1 835049034062e7685078618cd40f440947fe0217 SHA256 835c879294c4eaf35837cef9ba5d4af45afdb7370468cd1b385dd62f107b176e
-EBUILD libmowgli-9999.ebuild 681 RMD160 ce7a44cb7eab45c5925d97b2da7f084bb17f95bd SHA1 0c09187d9366bec4408d167f9ccad570f6a5e3a5 SHA256 bdc408daad2737d33e81f39aa2791c41e5b3f6c151c19f60d435b9236030d725
-MISC ChangeLog 9462 RMD160 18d115f8210358e4331b077c1d9e4801faede1dc SHA1 7ed3de4c6e2ef8a14f6b8d7ff39c4b8b09b1ed79 SHA256 192c6d11207c474735755bd31faa5e349359bf6e638958dd93200ac79ccbe64c
+EBUILD libmowgli-2.0.0.ebuild 884 RMD160 a0b858d0e38a80fac8f3db4ad273f7c2bd99fd46 SHA1 bd86593323f867271f187b354354bfe4f27860b5 SHA256 7d9e1e487b4d8e3e9b7610c15062e8c1457d07af78bd8a174b8c967d76575a71
+EBUILD libmowgli-9999.ebuild 755 RMD160 490a4dac6024cbc354372d200c50e7f34bee3311 SHA1 e6ef214348b4e50dbf51aac64288b659cc440c7a SHA256 507df5bc505e5701faa0b82ff76e4fb01d87fa7057e0676583950b54655e9143
+MISC ChangeLog 9704 RMD160 179c86aae5d9a992b9a20a7bbc20bee2651e8b66 SHA1 5c317002e599f75603e2cbdff2f6856b8c5a6131 SHA256 ff5ed0300c607f5c74c9e4105aa576be9c57ebeb1e6955b35440634e4111f03a
 MISC metadata.xml 438 RMD160 4a534b6f2ee9d588ee8c0b6d47bd5e5fd7350cfd SHA1 d87b01dee00a285c039699e8b8723d6d111bb3e7 SHA256 8b74f4d56c7a373758265c69922d42a7aad7c17c9da6f602cbec8c53fd58afbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk94aFMACgkQuQc30/atMkCvcQCghayIM81bAibP+KnM9+7JSy7v
-IgYAn0njsqrcWOFKhp1FUDKcfNdlT+Fk
-=UAhc
------END PGP SIGNATURE-----
diff --git a/dev-libs/libmowgli/libmowgli-2.0.0_alpha1.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0.ebuild
index 491b506384b0..ccec71554a62 100644
--- a/dev-libs/libmowgli/libmowgli-2.0.0_alpha1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.0.0.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/libmowgli-2.0.0_alpha1.ebuild,v 1.3 2012/02/20 19:03:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/libmowgli-2.0.0.ebuild,v 1.1 2012/04/20 00:34:52 jdhore Exp $
 
 EAPI=4
 
-MY_P=${P/_/-}
-
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="http://www.atheme.org/project/mowgli"
-SRC_URI="http://atheme.org/downloads/${MY_P}.tar.gz"
-IUSE=""
+SRC_URI="http://git.atheme.org/libmowgli-2/snapshot/${P}.tar.gz"
+IUSE="ssl"
 
 LICENSE="BSD-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+RDEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}"
+DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
 
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README doc/BOOST
+src_configure() {
+	# disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
+	use !ssl && myconf="--with-openssl=/dev/null"
+	econf ${myconf}
 }
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index adafd9fb7e4e..bb27a31a5e02 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/libmowgli-9999.ebuild,v 1.1 2012/02/20 19:00:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmowgli/libmowgli-9999.ebuild,v 1.2 2012/04/20 00:34:52 jdhore Exp $
 
 EAPI=4
 
 inherit git-2
 
-MY_P=${P/_/-}
-
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="http://www.atheme.org/project/mowgli"
 EGIT_REPO_URI="git://git.atheme.org/libmowgli-2.git"
@@ -18,12 +16,10 @@ SLOT="2"
 KEYWORDS=""
 RDEPEND="ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}"
+DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
 
 src_configure() {
-	econf $(use_enable ssl openssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README doc/BOOST
+	    # disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
+		use !ssl && myconf="--with-openssl=/dev/null"
+		econf ${myconf}
 }