Fixed compilation. Use autoload.

Package-Manager: portage-2.1.2.4

6 files changed, 98 insertions, 9 deletions

diff --git a/app-emacs/htmlfontify/ChangeLog b/app-emacs/htmlfontify/ChangeLog
index e188abc3164a..abd5860d0f54 100644
--- a/app-emacs/htmlfontify/ChangeLog
+++ b/app-emacs/htmlfontify/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/htmlfontify
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/htmlfontify/ChangeLog,v 1.12 2007/04/10 19:39:02 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/htmlfontify/ChangeLog,v 1.13 2007/04/17 19:21:45 ulm Exp $
+
+*htmlfontify-0.20-r1 (17 Apr 2007)
+
+  17 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/htmlfontify-0.20-emacs22.patch, +files/51htmlfontify-gentoo.el,
+  +htmlfontify-0.20-r1.ebuild:
+  Fixed compilation. Use "autoload" instead of "require". Don't install
+  LICENSE file.
 
   10 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
   htmlfontify-0.20.ebuild:
diff --git a/app-emacs/htmlfontify/Manifest b/app-emacs/htmlfontify/Manifest
index 5e18c1469e9f..226611b8e663 100644
--- a/app-emacs/htmlfontify/Manifest
+++ b/app-emacs/htmlfontify/Manifest
@@ -5,15 +5,27 @@ AUX 50htmlfontify-gentoo.el 102 RMD160 f1ed085350d1473d0f1da15d5cbe34683b856e11
 MD5 dbc8fe0bdc7406412df1e9306b70080f files/50htmlfontify-gentoo.el 102
 RMD160 f1ed085350d1473d0f1da15d5cbe34683b856e11 files/50htmlfontify-gentoo.el 102
 SHA256 5b78603bd593754557d588f452c0581cfa7a3573b8956e655c043cfd267ec4f7 files/50htmlfontify-gentoo.el 102
+AUX 51htmlfontify-gentoo.el 358 RMD160 b2edc33e39ed0e44535fde24db9f1f0423d96002 SHA1 82b63f6196bf5fa3c48f06d9399e1351c0435bb9 SHA256 a38f675923ad6f5fab6252ec3860c33112bc0495326b77241c2489e5c8c55b8d
+MD5 6de8e1687bdaa13dc6347934fdb15cc3 files/51htmlfontify-gentoo.el 358
+RMD160 b2edc33e39ed0e44535fde24db9f1f0423d96002 files/51htmlfontify-gentoo.el 358
+SHA256 a38f675923ad6f5fab6252ec3860c33112bc0495326b77241c2489e5c8c55b8d files/51htmlfontify-gentoo.el 358
+AUX htmlfontify-0.20-emacs22.patch 728 RMD160 83763824321a465b26e31bf82791438421e9cee8 SHA1 05ecf26e2e27f1ffe4dcc5527a9de9410893b94d SHA256 645eae1e2fe84af9e99fcf4e09eb8d037b325c0380a6e2328fe8c297cb955b18
+MD5 b20dd7172ea518d979ad66d2ed604ff6 files/htmlfontify-0.20-emacs22.patch 728
+RMD160 83763824321a465b26e31bf82791438421e9cee8 files/htmlfontify-0.20-emacs22.patch 728
+SHA256 645eae1e2fe84af9e99fcf4e09eb8d037b325c0380a6e2328fe8c297cb955b18 files/htmlfontify-0.20-emacs22.patch 728
 DIST htmlfontify_0.20+texinfo.tar.gz 61526 RMD160 fff06bfc5a414a879c986c6f29930ff69f64b2d2 SHA1 149d89526390b0f7c77048aff9d55906f2bbc7bb SHA256 68a1980130a593441c6ffd78f7c607b9290811c1046abd1098d64a90a37a3b9f
+EBUILD htmlfontify-0.20-r1.ebuild 911 RMD160 f0b00263e9a563fe90354b427c718dc19c1582c7 SHA1 d46a495188449fd8ffcd7c84aa975e8200eabd52 SHA256 6a6c2d72a927dd2690631bb589423d110fa89b6839ef461b5bab8426595c4be8
+MD5 fc1ee47d9eef7643ac9d541f0ec2d9a5 htmlfontify-0.20-r1.ebuild 911
+RMD160 f0b00263e9a563fe90354b427c718dc19c1582c7 htmlfontify-0.20-r1.ebuild 911
+SHA256 6a6c2d72a927dd2690631bb589423d110fa89b6839ef461b5bab8426595c4be8 htmlfontify-0.20-r1.ebuild 911
 EBUILD htmlfontify-0.20.ebuild 795 RMD160 b6e9cab55025f7ee100a1edee0f76bb27bdb458c SHA1 16c030c9226053175fe8d425f594509bb2e66468 SHA256 86e9a326e0316b81e3d02aa046c8691a6dfc26d642840dd0ba3a3ce5f2ebf631
 MD5 638c44dea2696eadfdbca7295321c058 htmlfontify-0.20.ebuild 795
 RMD160 b6e9cab55025f7ee100a1edee0f76bb27bdb458c htmlfontify-0.20.ebuild 795
 SHA256 86e9a326e0316b81e3d02aa046c8691a6dfc26d642840dd0ba3a3ce5f2ebf631 htmlfontify-0.20.ebuild 795
-MISC ChangeLog 1492 RMD160 3a39b295a05de7c4c6fc835cdb197f08154cd145 SHA1 ef1803bfdb9410dadda565fad2dc02e71bf9a6d5 SHA256 fc1282f90306535134e1560d1ffd3c7899704818813e54c6c4efc0e4012924af
-MD5 a8a483f415393b2771871ecf0f92820b ChangeLog 1492
-RMD160 3a39b295a05de7c4c6fc835cdb197f08154cd145 ChangeLog 1492
-SHA256 fc1282f90306535134e1560d1ffd3c7899704818813e54c6c4efc0e4012924af ChangeLog 1492
+MISC ChangeLog 1766 RMD160 317520b7c4eb5901d15f1e7c68c7c273ec6ba486 SHA1 ff8ef7f10149dcdec3412c44455d669eaef012ce SHA256 89b30a29af43721671956d237451334b47f6fd961bde4b187f3991caceab51ac
+MD5 9e516b434e0c002d037faf68360e5434 ChangeLog 1766
+RMD160 317520b7c4eb5901d15f1e7c68c7c273ec6ba486 ChangeLog 1766
+SHA256 89b30a29af43721671956d237451334b47f6fd961bde4b187f3991caceab51ac ChangeLog 1766
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -21,10 +33,13 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 f09192ee49157bb4f3a5baf8aaee97fe files/digest-htmlfontify-0.20 271
 RMD160 32ef34cc1cccd8caf6b2962bdc7c61e74bdc2bb8 files/digest-htmlfontify-0.20 271
 SHA256 74fe044bb524346a7a1733e66c7783bea5ecf70ef2f6ed883ed5faa0a7257092 files/digest-htmlfontify-0.20 271
+MD5 f09192ee49157bb4f3a5baf8aaee97fe files/digest-htmlfontify-0.20-r1 271
+RMD160 32ef34cc1cccd8caf6b2962bdc7c61e74bdc2bb8 files/digest-htmlfontify-0.20-r1 271
+SHA256 74fe044bb524346a7a1733e66c7783bea5ecf70ef2f6ed883ed5faa0a7257092 files/digest-htmlfontify-0.20-r1 271
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGG+fcNQqtfCuFneMRAqSRAJ4kwh9Rgj3d1rV0T1WW4Otq+DaGhgCeMwPR
-hR/hhSXAinEIdk1NDJf5gU4=
-=qauK
+iD8DBQFGJR7KOeoy/oIi7uwRAknmAKDlr6vOb246I2lUtNXLo0eNfEhKWwCg231O
+4E1XRxaUGafBubAEB0R1Pj8=
+=vwTS
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/htmlfontify/files/51htmlfontify-gentoo.el b/app-emacs/htmlfontify/files/51htmlfontify-gentoo.el
new file mode 100644
index 000000000000..f1209cedc260
--- /dev/null
+++ b/app-emacs/htmlfontify/files/51htmlfontify-gentoo.el
@@ -0,0 +1,8 @@
+
+;;; htmlfontify site-lisp configuration
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'htmlfontify-buffer "htmlfontify" nil t)
+(autoload 'htmlfontify-run-etags "htmlfontify" nil t)
+(autoload 'htmlfontify-copy-and-link-dir "htmlfontify" nil t)
+(autoload 'htmlfontify-load-rgb-file "hfy-cmap" nil t)
+(autoload 'htmlfontify-unload-rgb-file "hfy-cmap" nil t)
diff --git a/app-emacs/htmlfontify/files/digest-htmlfontify-0.20-r1 b/app-emacs/htmlfontify/files/digest-htmlfontify-0.20-r1
new file mode 100644
index 000000000000..aea5566ac084
--- /dev/null
+++ b/app-emacs/htmlfontify/files/digest-htmlfontify-0.20-r1
@@ -0,0 +1,3 @@
+MD5 551e196d63b07c2a75321d949731cdca htmlfontify_0.20+texinfo.tar.gz 61526
+RMD160 fff06bfc5a414a879c986c6f29930ff69f64b2d2 htmlfontify_0.20+texinfo.tar.gz 61526
+SHA256 68a1980130a593441c6ffd78f7c607b9290811c1046abd1098d64a90a37a3b9f htmlfontify_0.20+texinfo.tar.gz 61526
diff --git a/app-emacs/htmlfontify/files/htmlfontify-0.20-emacs22.patch b/app-emacs/htmlfontify/files/htmlfontify-0.20-emacs22.patch
new file mode 100644
index 000000000000..fb383952942a
--- /dev/null
+++ b/app-emacs/htmlfontify/files/htmlfontify-0.20-emacs22.patch
@@ -0,0 +1,19 @@
+--- htmlfontify.el~	2003-03-09 17:57:01.000000000 +0100
++++ htmlfontify.el	2007-04-12 12:48:57.000000000 +0200
+@@ -70,7 +70,7 @@
+ 
+   ;; emacs 20 compatibility:
+   (if (<= 21 emacs-major-version) nil ;; already post emacs21, NOOP
+-    (require 'hfy-emacs20))
++    (require 'hfy-emacs20)
+ 
+   ;; non-x-windows emacs20 duct tape...
+   ;; admittedly, we get no significant fontification here anyway
+@@ -78,6 +78,7 @@
+   (if window-system nil ;; NOOP
+     (defun x-color-defined-p (colour &optional frame)
+       (let ((window-system nil)) (if (hfy-colour-vals colour) t nil))))
++  )
+ 
+   ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+   ;; I want these - can't be bothered requiring all of cl though.
diff --git a/app-emacs/htmlfontify/htmlfontify-0.20-r1.ebuild b/app-emacs/htmlfontify/htmlfontify-0.20-r1.ebuild
new file mode 100644
index 000000000000..dd071dbe2701
--- /dev/null
+++ b/app-emacs/htmlfontify/htmlfontify-0.20-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/htmlfontify/htmlfontify-0.20-r1.ebuild,v 1.1 2007/04/17 19:21:45 ulm Exp $
+
+inherit elisp eutils
+
+MY_P=${PN}_${PV}+texinfo
+DESCRIPTION="Turn an Emacs buffer into display-equivalent HTML"
+HOMEPAGE="http://rtfm.etla.org/emacs/htmlfontify/"
+SRC_URI="http://rtfm.etla.org/emacs/htmlfontify/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+SITEFILE=51${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-emacs22.patch
+}
+
+src_compile() {
+	elisp-compile *.el || die "elisp-compile failed"
+	makeinfo htmlfontify.texi || die "makeinfo failed"
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo htmlfontify.info
+}