Decrappify this ebuild and package and add ppc64 love for KDE 4.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

5 files changed, 100 insertions, 7 deletions

diff --git a/dev-libs/chmlib/ChangeLog b/dev-libs/chmlib/ChangeLog
index 562e5680cf32..772c24951ef3 100644
--- a/dev-libs/chmlib/ChangeLog
+++ b/dev-libs/chmlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/chmlib
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/ChangeLog,v 1.2 2008/05/17 10:48:40 swegener Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/chmlib/ChangeLog,v 1.3 2008/11/02 08:11:07 vapier Exp $
+
+*chmlib-0.39-r1 (02 Nov 2008)
+
+  02 Nov 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/chmlib-0.39-headers.patch, +files/chmlib-0.39-stdtypes.patch,
+  +chmlib-0.39-r1.ebuild:
+  Decrappify this ebuild and package and add ppc64 love for KDE 4.
 
   13 May 2008; Peter Volkov <pva@gentoo.org> +metadata.xml,
   +chmlib-0.39.ebuild:
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 257251f09a49..6383aebb9726 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX chmlib-0.39-headers.patch 625 RMD160 77c98ff6100091a4c5972c7b603fe218b4c1b2d3 SHA1 7fe51a3483222b8863997d82949e0a32023f3ca0 SHA256 1dfc61761e1ad42d087736516f66ffa1138408caa4be1e03b1221ca7d80fba9a
+AUX chmlib-0.39-stdtypes.patch 620 RMD160 6512af68706253254a95591fb4b0303f77d7b721 SHA1 6bb9660d03797c210d44370d25a92907b05a11c4 SHA256 1d1124f81c955dcf856013d37095c212a8ad858a1dce52bd07fecc736a0eb82e
 DIST chmlib-0.39.tar.bz2 263013 RMD160 488f5a0619ee4c107014d768df6299971a0e0677 SHA1 985cb51136beaf42cdd886744ebe600ebacafcfc SHA256 d2305d449eb5a2922ed3e61714074b09aae2491aa0cdbb783ab33a1744e0ff41
+EBUILD chmlib-0.39-r1.ebuild 829 RMD160 8c2fbb46b06ff1b8c8ecc33a2ac693f9c105856d SHA1 3ccbb5a923b98318f81e45a15167aa8cd04549a3 SHA256 3d6db625ae3987a35856659ab79b7eee49fae8b1bf3f78b6c696c4ee4a23461c
 EBUILD chmlib-0.39.ebuild 1538 RMD160 6c1425ae6d578b55e7efe5b93d249b090626d4dd SHA1 5b5f40e5a575bd3bf9b7cfd374bd28521e230890 SHA256 08b6d7bacf3d396d6644dfc8715c6909de5f301c63109dff617bea579b68fa99
-MISC ChangeLog 3531 RMD160 d7c5adffc6ac4b6db0cbbfcf64eeff7ab2f9ea1f SHA1 0c02a0b090b0e62b6ae554e877eda5b489379712 SHA256 41424d0cad757b7fd907a69cd9490137cbd60f5d52876e350858d499e1cefe37
+MISC ChangeLog 3775 RMD160 7fce1ccadbd28bfec13a5a3d930f0c32fc5874bf SHA1 ed0ed8872e69ad1a46834405ee27082dfa8aaa4d SHA256 0fcd7ed54ebd70b8f43aa23bfede4ee23b9687c090316430c2072294b76ac711
 MISC metadata.xml 253 RMD160 b096274af87f9c103c75a962caafb7119d8806ce SHA1 12215f17ab0f6da7874825f25053cfd2a974a03b SHA256 360fc3b66d6f2c93018d2e4dc3bed95a8f078fd6097e15c2e42552fe4fa2bdc6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFILrgNI1lqEGTUzyQRAszlAJ9ZeXd6xyRB9tHSepfEvPWmyvy8YQCglAJL
-DZZJEg/M+if25TWjDlgzbFc=
-=NV6d
+iEYEARECAAYFAkkNYKEACgkQ67wieSYcaxegQwCfTuG0A+8pxj2gL2qeNsovECnq
+y/AAoOoyoYrLu3nOVjSmMvfwpEENkIee
+=74Jh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/chmlib/chmlib-0.39-r1.ebuild b/dev-libs/chmlib/chmlib-0.39-r1.ebuild
new file mode 100644
index 000000000000..0bc27c9d96c1
--- /dev/null
+++ b/dev-libs/chmlib/chmlib-0.39-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 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.1 2008/11/02 08:11:07 vapier 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="~amd64 ~hppa ~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/files/chmlib-0.39-headers.patch b/dev-libs/chmlib/files/chmlib-0.39-headers.patch
new file mode 100644
index 000000000000..0b2421a867ce
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.39-headers.patch
@@ -0,0 +1,32 @@
+--- 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>
diff --git a/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
new file mode 100644
index 000000000000..0f9232017689
--- /dev/null
+++ b/dev-libs/chmlib/files/chmlib-0.39-stdtypes.patch
@@ -0,0 +1,20 @@
+--- src/chm_lib.c
++++ src/chm_lib.c
+@@ -149,6 +149,17 @@ typedef unsigned __int32        UInt32;
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+ 
++/* Linux: use C standard types */
++#elif defined(__linux__)
++#include <stdint.h>
++typedef unsigned char           UChar;
++typedef int16_t                 Int16;
++typedef uint16_t                UInt16;
++typedef int32_t                 Int32;
++typedef uint32_t                UInt32;
++typedef int64_t                 Int64;
++typedef uint64_t                UInt64;
++
+ /* I386, 32-bit, non-Windows */
+ /* Sparc        */
+ /* MIPS         */