Revision bump. Port to EAPI 3. Make examples optional, add static-libs USE

flag. Remove old.

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

5 files changed, 48 insertions, 69 deletions

diff --git a/dev-libs/chmlib/ChangeLog b/dev-libs/chmlib/ChangeLog
index e2411f2c2055..b344f5a5e53a 100644
--- a/dev-libs/chmlib/ChangeLog
+++ b/dev-libs/chmlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/chmlib
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/ChangeLog,v 1.15 2009/10/12 19:20:04 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/ChangeLog,v 1.16 2010/12/19 21:09:26 dirtyepic Exp $
+
+*chmlib-0.40-r1 (19 Dec 2010)
+
+  19 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> -chmlib-0.39-r1.ebuild,
+  -files/chmlib-0.39-headers.patch, +chmlib-0.40-r1.ebuild:
+  Revision bump. Port to EAPI 3. Make examples optional, add static-libs USE
+  flag. Remove old.
 
   12 Oct 2009; Jeroen Roovers <jer@gentoo.org> chmlib-0.40.ebuild:
   Stable for HPPA (bug #286604).
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 88a69a54c2f6..2a229fa0e4be 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,9 +1,17 @@
-AUX chmlib-0.39-headers.patch 625 RMD160 77c98ff6100091a4c5972c7b603fe218b4c1b2d3 SHA1 7fe51a3483222b8863997d82949e0a32023f3ca0 SHA256 1dfc61761e1ad42d087736516f66ffa1138408caa4be1e03b1221ca7d80fba9a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX chmlib-0.39-stdtypes.patch 620 RMD160 6512af68706253254a95591fb4b0303f77d7b721 SHA1 6bb9660d03797c210d44370d25a92907b05a11c4 SHA256 1d1124f81c955dcf856013d37095c212a8ad858a1dce52bd07fecc736a0eb82e
 AUX chmlib-0.40-headers.patch 357 RMD160 829a21d33720ff7d3a4d6c2472aff067147e2dd1 SHA1 fc5115b1b4e33a99e65848b54cd4b548bcc58baa SHA256 60b67803466def393789c10daef789e0a54176aa1493d2e1e285730c60185683
-DIST chmlib-0.39.tar.bz2 263013 RMD160 488f5a0619ee4c107014d768df6299971a0e0677 SHA1 985cb51136beaf42cdd886744ebe600ebacafcfc SHA256 d2305d449eb5a2922ed3e61714074b09aae2491aa0cdbb783ab33a1744e0ff41
 DIST chmlib-0.40.tar.bz2 252036 RMD160 f79d6b3d94f8eb8aa0c517c0805d2ac8e1128f64 SHA1 5231d7531e8808420d7f89fd1e4fdbac1ed7a167 SHA256 3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
-EBUILD chmlib-0.39-r1.ebuild 838 RMD160 3c1343756819784af2ec7bea2e1ae44020e18e5f SHA1 5cf76c9588fc704bbf0fde13127c6bd7aec24609 SHA256 14aa03f4e7b0a730d201c2cb7d14df9d62169f85fdbbe3037706ef8d3aa37505
+EBUILD chmlib-0.40-r1.ebuild 729 RMD160 8b7649008aa07dfb1cdc61f854b84a4db65ae826 SHA1 75304a66dad3ceff3e2cf8411551a84f943e0c01 SHA256 e94d66775da24ceb118e135f533fe3f7b81ab6a84fc4584dc0183d259a40692c
 EBUILD chmlib-0.40.ebuild 836 RMD160 033b914d012cb4e8e70f9934e39636a4a06743b0 SHA1 dfe29aa0007556900f8b2ebf0c160cb56c2437d1 SHA256 d121def60f3e5d9dcde621f7e55fe412d8a42d2ca5c452836c96d17ab02b4ad3
-MISC ChangeLog 5017 RMD160 2a3c8a26ff8eadf7f4b4295904aecba9704a9634 SHA1 c9db28fda3f20fc54f7b75e6a2a3772237800a7e SHA256 bf0d1e211b1c6ebc0e26b7283683b252b6c04d155a5519df7c7d4dad730b769f
+MISC ChangeLog 5284 RMD160 1292af3ef73516473a9f42f2783cccba6e32baf8 SHA1 71bc4f57844f9503e9dee8b4faeff51eee3ba6c9 SHA256 1d89bdc34862e22f033523465f3ec428d199d519eefcd17a008174128c044152
 MISC metadata.xml 253 RMD160 b096274af87f9c103c75a962caafb7119d8806ce SHA1 12215f17ab0f6da7874825f25053cfd2a974a03b SHA256 360fc3b66d6f2c93018d2e4dc3bed95a8f078fd6097e15c2e42552fe4fa2bdc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0Odc0ACgkQiqiDRvmkBmLOJgCg8KQI2LibE2XiGV04no77nO+o
+JhEAn1vxMP4wfZROG41PfEkQzfW0m8wZ
+=vuVb
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/chmlib/chmlib-0.39-r1.ebuild b/dev-libs/chmlib/chmlib-0.39-r1.ebuild
deleted file mode 100644
index 58a8b1b445e2..000000000000
--- a/dev-libs/chmlib/chmlib-0.39-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/chmlib-0.39-r1.ebuild,v 1.6 2009/04/11 17:28:31 armin76 Exp $
-
-inherit eutils multilib flag-o-matic versionator
-
-DESCRIPTION="Library for MS CHM (compressed html) file format plus extracting and http server utils"
-HOMEPAGE="http://www.jedrea.com/chmlib/"
-SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-stdtypes.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
-
-src_compile() {
-	econf --enable-examples || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README
-}
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
new file mode 100644
index 000000000000..21e6b9f9eed6
--- /dev/null
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/chmlib-0.40-r1.ebuild,v 1.1 2010/12/19 21:09:26 dirtyepic Exp $
+
+EAPI="3"
+
+inherit autotools-utils
+
+DESCRIPTION="Library for MS CHM (compressed html) file format"
+HOMEPAGE="http://www.jedrea.com/chmlib/"
+SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples static-libs"
+
+DOCS=(AUTHORS NEWS README)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.39-stdtypes.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
+
+src_configure() {
+	myeconfargs=($(use_enable examples))
+	autotools-utils_src_configure
+}
diff --git a/dev-libs/chmlib/files/chmlib-0.39-headers.patch b/dev-libs/chmlib/files/chmlib-0.39-headers.patch
deleted file mode 100644
index 0b2421a867ce..000000000000
--- a/dev-libs/chmlib/files/chmlib-0.39-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/chm_http.c
-+++ src/chm_http.c
-@@ -34,6 +34,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #if __sun || __sgi
-   #include <strings.h>
- #endif
-@@ -42,6 +43,7 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- 
- /* threading includes */
- #include <pthread.h>
---- src/extract_chmLib.c
-+++ src/extract_chmLib.c
-@@ -27,11 +27,7 @@
- #define snprintf _snprintf
- #define rindex strrchr
- #else
--#if __i386__
- #include <string.h>
--#else
--#include <strings.h>
--#endif
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/types.h>