remove old ebuild; introduce doc and examples USE flags; don't install COPYRIGHT files; make intallation succesful even without USE=emacs

Package-Manager: portage-2.1.3.9

4 files changed, 41 insertions, 30 deletions

diff --git a/app-office/magicpoint/ChangeLog b/app-office/magicpoint/ChangeLog
index 2e962fa47091..1a7c65fc543b 100644
--- a/app-office/magicpoint/ChangeLog
+++ b/app-office/magicpoint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/magicpoint
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.28 2007/09/25 06:13:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/ChangeLog,v 1.29 2007/09/25 11:50:19 opfer Exp $
+
+*magicpoint-1.12a-r1 (25 Sep 2007)
+
+  25 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  -magicpoint-1.12a.ebuild, +magicpoint-1.12a-r1.ebuild:
+  remove old ebuild; introduce doc and examples USE flags; don't install
+  COPYRIGHT files; make intallation succesful even without USE=emacs
 
   25 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   magicpoint-1.12a.ebuild:
diff --git a/app-office/magicpoint/Manifest b/app-office/magicpoint/Manifest
index a7e221f2decd..9a11f0b0d851 100644
--- a/app-office/magicpoint/Manifest
+++ b/app-office/magicpoint/Manifest
@@ -23,14 +23,14 @@ EBUILD magicpoint-1.11b.ebuild 2751 RMD160 6d9d900e1821bc2bccdeecd4c112c1272ed3b
 MD5 1342ab52a356e281fae5f57b4c51e490 magicpoint-1.11b.ebuild 2751
 RMD160 6d9d900e1821bc2bccdeecd4c112c1272ed3b57e magicpoint-1.11b.ebuild 2751
 SHA256 1ac45813514fce90f7da5b15ae9c95b8c24fb51eec86c12c15baa83bea09ff67 magicpoint-1.11b.ebuild 2751
-EBUILD magicpoint-1.12a.ebuild 3047 RMD160 5dbc23b4933f3ef48552e51aadbba70934a3af53 SHA1 710444ca88e6b81adde705eb7e88217edf188cfd SHA256 da2d58ed3534aedda3754b886624ff758c8e51212495e26aa2b1d32fba2736e1
-MD5 1a3aa2beb0a2ad0fca020c4b29144b38 magicpoint-1.12a.ebuild 3047
-RMD160 5dbc23b4933f3ef48552e51aadbba70934a3af53 magicpoint-1.12a.ebuild 3047
-SHA256 da2d58ed3534aedda3754b886624ff758c8e51212495e26aa2b1d32fba2736e1 magicpoint-1.12a.ebuild 3047
-MISC ChangeLog 6998 RMD160 e3947e88566255a255243bb5339072dd76129563 SHA1 9a66b946db3b9f0c8b974d46dec8147caced3d78 SHA256 0fb73b95cb2abccf42cbbab37ca68cf3c3d44b87c8494b71c4602008f79b4534
-MD5 5c396ad9f00e18a5d0067fba5a95ab57 ChangeLog 6998
-RMD160 e3947e88566255a255243bb5339072dd76129563 ChangeLog 6998
-SHA256 0fb73b95cb2abccf42cbbab37ca68cf3c3d44b87c8494b71c4602008f79b4534 ChangeLog 6998
+EBUILD magicpoint-1.12a-r1.ebuild 3083 RMD160 61b94333ae9989e6a5b8f68f403201fd33cf1f84 SHA1 4b4a40244130558a3fc8e0cbb5a113ab14c3e668 SHA256 b618e9c095c6916e64856a70030165add5fac6ec76ca1dd5fdf5735a3bcd924d
+MD5 810284e8399d89e87a98ef7cecd96a79 magicpoint-1.12a-r1.ebuild 3083
+RMD160 61b94333ae9989e6a5b8f68f403201fd33cf1f84 magicpoint-1.12a-r1.ebuild 3083
+SHA256 b618e9c095c6916e64856a70030165add5fac6ec76ca1dd5fdf5735a3bcd924d magicpoint-1.12a-r1.ebuild 3083
+MISC ChangeLog 7289 RMD160 96fd4ec746ce04ba5c4de2f2192649521fe483f3 SHA1 86b6ed078402ccbbfeb618235546b6dbff75db7f SHA256 f80f1e9927b56fe25865be5566caf3844f3e2093bc19d9b71c3bc5db687e33cc
+MD5 7c41fe42f226c8d591b51e5ef9cf3195 ChangeLog 7289
+RMD160 96fd4ec746ce04ba5c4de2f2192649521fe483f3 ChangeLog 7289
+SHA256 f80f1e9927b56fe25865be5566caf3844f3e2093bc19d9b71c3bc5db687e33cc ChangeLog 7289
 MISC metadata.xml 570 RMD160 364228d6f8a5ac84f59d6f65b90cd33d1cd88595 SHA1 5b4fc928fb888520247afaa0f39e76b4e134ba21 SHA256 7a1fa2a71e91b5c87a8ad52328ce74dc653d8868d0ffa8a2f2e0cb6952f71253
 MD5 cca347d4b0e88766d322951ccf1e97e7 metadata.xml 570
 RMD160 364228d6f8a5ac84f59d6f65b90cd33d1cd88595 metadata.xml 570
@@ -38,13 +38,13 @@ SHA256 7a1fa2a71e91b5c87a8ad52328ce74dc653d8868d0ffa8a2f2e0cb6952f71253 metadata
 MD5 ca75f8f23271bd4e2a2fb86480cfc6c2 files/digest-magicpoint-1.11b 250
 RMD160 cda799636d2398fa897432d5b4fe7d64d37bcf91 files/digest-magicpoint-1.11b 250
 SHA256 adb1abefc2aa18dc308364a4ec0cde8802790a3684a7e35788033d7fb83851fb files/digest-magicpoint-1.11b 250
-MD5 59dc4d7f9468f183aae000f9ce9b7b57 files/digest-magicpoint-1.12a 250
-RMD160 f8beb83e648305de04cf3541d8891bad4fd85f11 files/digest-magicpoint-1.12a 250
-SHA256 2c72e789034c5e7b4b8ecda775f4faf6017c6fc8c30a7b8d028ae7776c9437f5 files/digest-magicpoint-1.12a 250
+MD5 59dc4d7f9468f183aae000f9ce9b7b57 files/digest-magicpoint-1.12a-r1 250
+RMD160 f8beb83e648305de04cf3541d8891bad4fd85f11 files/digest-magicpoint-1.12a-r1 250
+SHA256 2c72e789034c5e7b4b8ecda775f4faf6017c6fc8c30a7b8d028ae7776c9437f5 files/digest-magicpoint-1.12a-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG+KcnNQqtfCuFneMRArC8AJwJJ/CLDPMfX8ArLbfm7zDkiKz4pgCePzWY
-iwKHIqahKb0TF0M9CuOYpdo=
-=cOhE
+iD8DBQFG+PYBNQqtfCuFneMRAqdpAJwPdA8ZqS4be94eclzkkjBx9LiGPQCfYJwe
+YJktjqtvatE/i14q0FRFiAM=
+=+s4W
 -----END PGP SIGNATURE-----
diff --git a/app-office/magicpoint/files/digest-magicpoint-1.12a b/app-office/magicpoint/files/digest-magicpoint-1.12a-r1
index 6387a6588b95..6387a6588b95 100644
--- a/app-office/magicpoint/files/digest-magicpoint-1.12a
+++ b/app-office/magicpoint/files/digest-magicpoint-1.12a-r1
diff --git a/app-office/magicpoint/magicpoint-1.12a.ebuild b/app-office/magicpoint/magicpoint-1.12a-r1.ebuild
index ae55a18c077d..aed3478ad690 100644
--- a/app-office/magicpoint/magicpoint-1.12a.ebuild
+++ b/app-office/magicpoint/magicpoint-1.12a-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.12a.ebuild,v 1.5 2007/09/25 06:13:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/magicpoint/magicpoint-1.12a-r1.ebuild,v 1.1 2007/09/25 11:50:19 opfer Exp $
 
 inherit autotools elisp-common eutils fixheadtails
 
-DESCRIPTION="an X11 based presentation tool"
+DESCRIPTION="An X11 based presentation tool"
 SRC_URI="ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/${P}.tar.gz
 	ftp://ftp.mew.org/pub/MagicPoint/${P}.tar.gz"
 HOMEPAGE="http://member.wide.ad.jp/wg/mgp/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
-IUSE="cjk nls m17n-lib emacs truetype gif imlib"
+KEYWORDS="~amd64 ~alpha ~ppc ~sparc ~x86"
+IUSE="cjk doc emacs examples gif imlib m17n-lib nls truetype"
 
 MY_DEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -64,8 +64,10 @@ src_compile() {
 	emake -j1 Makefiles || die "emake Makefiles failed"
 	emake -j1 clean || die "emake clean failed"
 	emake -j1 BINDIR=/usr/bin LIBDIR=/etc/X11 || die "emake failed"
-	use emacs && cp contrib/*.el "${S}" && \
-		elisp-compile *.el || die "elisp-compile failed"
+	if use emacs; then
+	   cd contrib/
+	   elisp-compile *.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -82,22 +84,24 @@ src_install() {
 		MANSUFFIX=1 \
 		install.man || die "emake install.man failed"
 
-	exeinto /usr/bin
-	doexe contrib/{mgp2html.pl,mgp2latex.pl}
+	dobin contrib/{mgp2html.pl,mgp2latex.pl}
 
 	if use emacs ; then
 		elisp-install ${PN} *.el *.elc || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
-	dodoc COPYRIGHT* FAQ README* RELNOTES SYNTAX TODO* USAGE*
+	use doc && dodoc FAQ README* RELNOTES SYNTAX TODO* USAGE*
 
-	insinto /usr/share/${PF}/sample
-	cd sample
-	doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
-		mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
-		multilingual.mgp sample*.mgp sendmail6*.mgp \
-		tutorial*.mgp v6*.mgp v6header.* || die "example installation failed"
+	if use examples; then
+		cd sample
+		insinto /usr/share/${PF}/sample
+		doins README* cloud.jpg dad.* embed*.mgp gradation*.mgp \
+			mgp-old*.jpg mgp.mng mgp3.xbm mgprc-sample \
+			multilingual.mgp sample*.mgp sendmail6*.mgp \
+			tutorial*.mgp v6*.mgp v6header.* || \
+			die "example installation failed"
+	fi
 }
 
 pkg_postinst() {