Added script to /usr/bin to execute eagle as recommended by CadSoft - see bug #188368.

Package-Manager: portage-2.1.3.19

7 files changed, 157 insertions, 32 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index 1fbd0aba08d8..b46c3311d076 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-electronics/eagle
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.9 2007/10/13 14:11:06 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.10 2007/11/10 22:52:51 nixphoeni Exp $
+
+*eagle-4.16_p2-r1 (10 Nov 2007)
+
+  10 Nov 2007; Joe Sapp <nixphoeni@gentoo.org> +files/eagle_wrapper_script,
+  eagle-4.16_p1.ebuild, eagle-4.16_p2.ebuild, +eagle-4.16_p2-r1.ebuild:
+  Added script to /usr/bin to execute eagle as recommended by CadSoft at
+  http://www.cadsoft.de/faq.htm#17040701 . Also see bug #188368. This
+  eliminates the need to append the eagle directory to the PATH env var.
+  Also quoted variables that may need it.
 
   13 Oct 2007; Christoph Mende <angelos@gentoo.org> eagle-4.16_p2.ebuild:
   Stable on amd64 wrt bug #188368
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index 8cc40fd220ee..c5acbd6522b8 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX eagle_wrapper_script 242 RMD160 d69652528227e7b4458ebbcd5b6cec79570eb9e5 SHA1 ab88555629b3050ba1c06aac8e68fe7e60d7d122 SHA256 761bc618998d8f4d3ed751075b1d50bf781cca35045645cf76828175b2448ab7
+MD5 14e7791db21945bfa2be8de884d2a3cd files/eagle_wrapper_script 242
+RMD160 d69652528227e7b4458ebbcd5b6cec79570eb9e5 files/eagle_wrapper_script 242
+SHA256 761bc618998d8f4d3ed751075b1d50bf781cca35045645cf76828175b2448ab7 files/eagle_wrapper_script 242
 DIST cadsoft_eagle_manual-eng-2006.04.03.pdf 1875608 RMD160 a5a8cf52cb3c027dcf9e38638813db9fc5728be7 SHA1 08e6e8e72fcca07b4f58987f74b723cd8980ac9e SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733
 DIST cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608 RMD160 a5a8cf52cb3c027dcf9e38638813db9fc5728be7 SHA1 08e6e8e72fcca07b4f58987f74b723cd8980ac9e SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733
 DIST cadsoft_eagle_manual-ger-2006.04.03.pdf 3178176 RMD160 79e021301507e12fefec3d227f0e3a495f12b42b SHA1 3cecdb01c8f0fa8b85b5dfb83b49e52141eabba6 SHA256 1b2bba3af2bfa14194a17aa0218101f934204e54b207c0617b7d86a522ea55cd
@@ -9,18 +10,22 @@ DIST eagle-lin-eng-4.16r1.tgz 8595252 RMD160 a7ebd46e1699da846c397df1a068daf2eca
 DIST eagle-lin-eng-4.16r2.tgz 8922532 RMD160 32449bbed7df918e7825cd91f1c559cc0d8966f9 SHA1 42c2f619d8f765c5c9feaa1d7f75583c02f3ff6b SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4
 DIST eagle-lin-ger-4.16r1.tgz 8695183 RMD160 1e81ef99872c78b5eebc5f4169260c2597effec5 SHA1 b4e663ea5188d9793ba88ef7121bf12a8f13bff1 SHA256 de5a6a4f064920c9aa2dd00dcdab584967fb66db62251e1f846c12b57e36b1ad
 DIST eagle-lin-ger-4.16r2.tgz 9018957 RMD160 e6d978c131c5af767f2c6bcee52907460de121d7 SHA1 a7f96eb95ec6eb61f1d043501d6d4fa0fb512706 SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259
-EBUILD eagle-4.16_p1.ebuild 1940 RMD160 3a21a223477dec14c40cf348ae896e57a1659ef1 SHA1 5e695fb56772d8ed6617c4f98a14753baf7a34b7 SHA256 e8803e0781ba81dde5963eeec6e6b395cadbf34d43f9715673e5ca9b6a0c34fa
-MD5 f577baa29c625596c541e689a113a046 eagle-4.16_p1.ebuild 1940
-RMD160 3a21a223477dec14c40cf348ae896e57a1659ef1 eagle-4.16_p1.ebuild 1940
-SHA256 e8803e0781ba81dde5963eeec6e6b395cadbf34d43f9715673e5ca9b6a0c34fa eagle-4.16_p1.ebuild 1940
-EBUILD eagle-4.16_p2.ebuild 2199 RMD160 b1983fe1d439553f1a0197ed05e6beb09c913e91 SHA1 f35e589ae93c16a22121d0b213463d120beb97e3 SHA256 2fb7af9cf825c79d93a1f9c63e8c506c0b5f7ef912a77c5c5ba97b2b1398f267
-MD5 d8a8cf6e2bf5592cc4b88a1330fc1c14 eagle-4.16_p2.ebuild 2199
-RMD160 b1983fe1d439553f1a0197ed05e6beb09c913e91 eagle-4.16_p2.ebuild 2199
-SHA256 2fb7af9cf825c79d93a1f9c63e8c506c0b5f7ef912a77c5c5ba97b2b1398f267 eagle-4.16_p2.ebuild 2199
-MISC ChangeLog 1445 RMD160 c8f8d3462deadad13d7f2b8dc12415b73914614b SHA1 16635958746b3e1272595c0262188584773abc83 SHA256 086d72245b1d69e49a9d99d522e308b819a44cb8aec16751954c8193889d8d5b
-MD5 9f82b6e54a2b798076df247070c2a0f3 ChangeLog 1445
-RMD160 c8f8d3462deadad13d7f2b8dc12415b73914614b ChangeLog 1445
-SHA256 086d72245b1d69e49a9d99d522e308b819a44cb8aec16751954c8193889d8d5b ChangeLog 1445
+EBUILD eagle-4.16_p1.ebuild 1973 RMD160 cec6301f442c08d24b78c012d5918b56ed6a217d SHA1 4a1c8a7e9db39fe39c5a0ba8685c2293633bc5a7 SHA256 a51f025525053aeb87964b74466aec968f0eb0b4b1ac8586aea011d7cf8f2fc9
+MD5 61b71a88f9eaa4c1e4f8329302fddb20 eagle-4.16_p1.ebuild 1973
+RMD160 cec6301f442c08d24b78c012d5918b56ed6a217d eagle-4.16_p1.ebuild 1973
+SHA256 a51f025525053aeb87964b74466aec968f0eb0b4b1ac8586aea011d7cf8f2fc9 eagle-4.16_p1.ebuild 1973
+EBUILD eagle-4.16_p2-r1.ebuild 2556 RMD160 965e11aae2d5e73949b43279d5c3821ddfb5e175 SHA1 a66c934850efbf005dfe9885f815f8f577e5ec60 SHA256 da17c00a3b1001b29a3450eb50119b73fda7224c74b3778f140165e3bce4592f
+MD5 3517bfba575bf150c9b0455f029be08b eagle-4.16_p2-r1.ebuild 2556
+RMD160 965e11aae2d5e73949b43279d5c3821ddfb5e175 eagle-4.16_p2-r1.ebuild 2556
+SHA256 da17c00a3b1001b29a3450eb50119b73fda7224c74b3778f140165e3bce4592f eagle-4.16_p2-r1.ebuild 2556
+EBUILD eagle-4.16_p2.ebuild 2235 RMD160 dc05b850be1cd7bb9b8a97a53c0cd8de446cfaae SHA1 e7b6630ace123adc032584e1ddcfedb86f2c8530 SHA256 e745af7b887eac5ee80e849a36c7fb9e2727d09c6047d0788b0735f72739cdef
+MD5 0824094f6cba14c364229723ccbf274c eagle-4.16_p2.ebuild 2235
+RMD160 dc05b850be1cd7bb9b8a97a53c0cd8de446cfaae eagle-4.16_p2.ebuild 2235
+SHA256 e745af7b887eac5ee80e849a36c7fb9e2727d09c6047d0788b0735f72739cdef eagle-4.16_p2.ebuild 2235
+MISC ChangeLog 1888 RMD160 9f76392a931c281ae17d58c43363cc855cd5cfc4 SHA1 cb487b9a633b77fbae6022a6334638cc6270fe30 SHA256 91530a2a2a722a721fd7bab415e9315c2e4e976efde7ad63b216030ca093266f
+MD5 7d7476f0646208a47ce6bd934cc16d32 ChangeLog 1888
+RMD160 9f76392a931c281ae17d58c43363cc855cd5cfc4 ChangeLog 1888
+SHA256 91530a2a2a722a721fd7bab415e9315c2e4e976efde7ad63b216030ca093266f ChangeLog 1888
 MISC metadata.xml 650 RMD160 94bb3ebbd80b6819de3fca30d1da3a7c986fc130 SHA1 013c84de6fcea30c6313af7f0841d3c3ced1cc1b SHA256 474e9463b0e4fd66eac3d290fa4a8ba7b98c49ce42e085d4b7f2a6a2573c4642
 MD5 14fdd672c394dafc46cecf2b370c4f21 metadata.xml 650
 RMD160 94bb3ebbd80b6819de3fca30d1da3a7c986fc130 metadata.xml 650
@@ -31,10 +36,6 @@ SHA256 59f5492fc61f15c338204b97eb7581bb40b5d39aa150f93d6f0a85e5c85114df files/di
 MD5 68f29f82ab7cc9b7e3e77c1c24eb585c files/digest-eagle-4.16_p2 1114
 RMD160 9015e08cd447f9fa9e4b809a377b43bb4a5d4139 files/digest-eagle-4.16_p2 1114
 SHA256 d7b41e5d1111074d97b942a34167ee39c0b603303003847d5cb85e8ba4e23598 files/digest-eagle-4.16_p2 1114
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHENIAKhnDs22gwa8RAknVAJ484Z6EnbbAUiFMYpJHxtjDkuk8CgCeIix5
-5Bb9gfpamWvvmFHue4MNaq4=
-=Z/DV
------END PGP SIGNATURE-----
+MD5 68f29f82ab7cc9b7e3e77c1c24eb585c files/digest-eagle-4.16_p2-r1 1114
+RMD160 9015e08cd447f9fa9e4b809a377b43bb4a5d4139 files/digest-eagle-4.16_p2-r1 1114
+SHA256 d7b41e5d1111074d97b942a34167ee39c0b603303003847d5cb85e8ba4e23598 files/digest-eagle-4.16_p2-r1 1114
diff --git a/sci-electronics/eagle/eagle-4.16_p1.ebuild b/sci-electronics/eagle/eagle-4.16_p1.ebuild
index 50f1ad339ea7..26b3c71f753c 100644
--- a/sci-electronics/eagle/eagle-4.16_p1.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p1.ebuild,v 1.5 2007/09/13 01:42:17 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p1.ebuild,v 1.6 2007/11/10 22:52:51 nixphoeni Exp $
 
 inherit eutils
 
@@ -37,7 +37,7 @@ case "${LINGUAS}" in
 esac
 MANFILE=${MANDOC}-${MY_LANG}-${MANVER}.pdf
 MY_P=${PN}-lin-${MY_LANG}-${MY_PV}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 
@@ -55,7 +55,7 @@ src_install() {
 
 	# Install the documentation
 	dodoc README doc/*
-	use doc && cp ${MANFILE} ${D}/usr/share/doc/${PF}
+	use doc && cp ${MANFILE} "${D}"/usr/share/doc/${PF}
 	doman man/eagle.1
 	# Remove docs left in INSTALLDIR
 	rm -rf "${D}"/${INSTALLDIR}/{README,install,${MANFILE}} "${D}"/${INSTALLDIR}/doc "${D}"/${INSTALLDIR}/man
@@ -71,7 +71,8 @@ src_install() {
 
 pkg_postinst() {
 
-	elog "Run \`env-update && source /etc/profile\` now to set up the correct paths."
+	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
+	elog "now to set up the correct paths."
 	elog "You must first run eagle as root to invoke product registration."
 
 }
diff --git a/sci-electronics/eagle/eagle-4.16_p2-r1.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r1.ebuild
new file mode 100644
index 000000000000..ff4561bb8d63
--- /dev/null
+++ b/sci-electronics/eagle/eagle-4.16_p2-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r1.ebuild,v 1.1 2007/11/10 22:52:51 nixphoeni Exp $
+
+inherit eutils
+
+DESCRIPTION="EAGLE Layout Editor"
+HOMEPAGE="http://www.cadsoft.de"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="linguas_de doc"
+LICENSE="cadsoft"
+RESTRICT="strip"
+SLOT="0"
+
+MY_PV=${PV/_p/r}
+MANDOC="cadsoft_eagle_manual"
+#
+# When updating this package:
+#  1) fetch the english and german documentation
+#  2) update the following MANVER to the document's date
+#  3) rename the docs to "${MANDOC}-{eng,ger}-${MANVER}.pdf"
+#  4) stick them on the mirrors (or in your local ${DISTDIR})
+#
+MANVER="2006.12.13"
+
+SRC_URI="linguas_de? ( ftp://ftp.cadsoft.de/pub/program/${MY_PV}/${PN}-lin-ger-${MY_PV}.tgz
+			doc? ( mirror://gentoo/${MANDOC}-ger-${MANVER}.pdf ) )
+	!linguas_de? ( ftp://ftp.cadsoft.de/pub/program/${MY_PV}/${PN}-lin-eng-${MY_PV}.tgz
+			doc? ( mirror://gentoo/${MANDOC}-eng-${MANVER}.pdf ) )"
+
+RDEPEND="sys-libs/glibc
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+
+INSTALLDIR="/opt/eagle"
+case "${LINGUAS}" in
+	*de*)
+		MY_LANG="ger";;
+	*)
+		MY_LANG="eng";;
+esac
+MANFILE=${MANDOC}-${MY_LANG}-${MANVER}.pdf
+MY_P=${PN}-lin-${MY_LANG}-${MY_PV}
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+
+	unpack ${MY_P}.tgz
+	use doc && cp "${DISTDIR}"/${MANFILE} "${S}"
+
+}
+
+src_install() {
+
+	cd "${S}"
+	dodir ${INSTALLDIR}
+	# Copy all to INSTALLDIR
+	cp -r . "${D}"/${INSTALLDIR}
+
+	# Install wrapper (suppressing leading tabs)
+	# see bug #188368 or http://www.cadsoft.de/faq.htm#17040701
+	exeinto /usr/bin
+	newexe "${FILESDIR}/eagle_wrapper_script" eagle
+	# Finally, append the path of the eagle binary respecting INSTALLDIR
+	echo "${INSTALLDIR}/bin/eagle" >> "${D}/usr/bin/eagle"
+
+	# Install the documentation
+	dodoc README doc/*
+	doman man/eagle.1
+	# Conditionally install the user's manual
+	use doc && cp ${MANFILE} "${D}/usr/share/doc/${PF}"
+	# Remove docs left in INSTALLDIR
+	rm -rf "${D}${INSTALLDIR}/{README,install,${MANFILE}}" "${D}${INSTALLDIR}/doc" "${D}${INSTALLDIR}/man"
+
+	echo -e "ROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}/90eagle"
+	doenvd "${S}/90eagle"
+
+	# Create desktop entry
+	doicon bin/${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm "Graphics;Electronics"
+
+}
+
+pkg_postinst() {
+
+	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
+	elog "now to set up the correct paths."
+	elog "You must first run eagle as root to invoke product registration."
+
+}
diff --git a/sci-electronics/eagle/eagle-4.16_p2.ebuild b/sci-electronics/eagle/eagle-4.16_p2.ebuild
index c3b50a718434..c6473924d599 100644
--- a/sci-electronics/eagle/eagle-4.16_p2.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2.ebuild,v 1.4 2007/10/13 14:11:06 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2.ebuild,v 1.5 2007/11/10 22:52:51 nixphoeni Exp $
 
 inherit eutils
 
 DESCRIPTION="EAGLE Layout Editor"
 HOMEPAGE="http://www.cadsoft.de"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 x86"
 IUSE="linguas_de doc"
 LICENSE="cadsoft"
 RESTRICT="strip"
@@ -44,7 +44,7 @@ case "${LINGUAS}" in
 esac
 MANFILE=${MANDOC}-${MY_LANG}-${MANVER}.pdf
 MY_P=${PN}-lin-${MY_LANG}-${MY_PV}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 
@@ -62,7 +62,7 @@ src_install() {
 
 	# Install the documentation
 	dodoc README doc/*
-	use doc && cp ${MANFILE} ${D}/usr/share/doc/${PF}
+	use doc && cp ${MANFILE} "${D}"/usr/share/doc/${PF}
 	doman man/eagle.1
 	# Remove docs left in INSTALLDIR
 	rm -rf "${D}"/${INSTALLDIR}/{README,install,${MANFILE}} "${D}"/${INSTALLDIR}/doc "${D}"/${INSTALLDIR}/man
@@ -78,7 +78,8 @@ src_install() {
 
 pkg_postinst() {
 
-	elog "Run \`env-update && source /etc/profile\` now to set up the correct paths."
+	elog "Run \`env-update && source /etc/profile\` from within \${ROOT}"
+	elog "now to set up the correct paths."
 	elog "You must first run eagle as root to invoke product registration."
 
 }
diff --git a/sci-electronics/eagle/files/digest-eagle-4.16_p2-r1 b/sci-electronics/eagle/files/digest-eagle-4.16_p2-r1
new file mode 100644
index 000000000000..2661398bb634
--- /dev/null
+++ b/sci-electronics/eagle/files/digest-eagle-4.16_p2-r1
@@ -0,0 +1,12 @@
+MD5 1e85f214b4229023ec22167ee8c6b485 cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608
+RMD160 a5a8cf52cb3c027dcf9e38638813db9fc5728be7 cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608
+SHA256 805fbef15bd4584f6a976d8a2cc672f00ce3ad32d018ce53b7c9ce80b9965733 cadsoft_eagle_manual-eng-2006.12.13.pdf 1875608
+MD5 bc5a380e943e741b4b85f6c9e8b23ddc cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176
+RMD160 79e021301507e12fefec3d227f0e3a495f12b42b cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176
+SHA256 1b2bba3af2bfa14194a17aa0218101f934204e54b207c0617b7d86a522ea55cd cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176
+MD5 9648bed26f901ea634a69d18b9c33dce eagle-lin-eng-4.16r2.tgz 8922532
+RMD160 32449bbed7df918e7825cd91f1c559cc0d8966f9 eagle-lin-eng-4.16r2.tgz 8922532
+SHA256 dc71102780621022c5f3b124bbcde075f23d3e04d624a2985afa733fbae8c7e4 eagle-lin-eng-4.16r2.tgz 8922532
+MD5 e4605f15dde129a2b1a5d65d87d832b2 eagle-lin-ger-4.16r2.tgz 9018957
+RMD160 e6d978c131c5af767f2c6bcee52907460de121d7 eagle-lin-ger-4.16r2.tgz 9018957
+SHA256 6c570e41668da23e1f473da3bfd879cbeb76bea02d35ae13970db48b3aa36259 eagle-lin-ger-4.16r2.tgz 9018957
diff --git a/sci-electronics/eagle/files/eagle_wrapper_script b/sci-electronics/eagle/files/eagle_wrapper_script
new file mode 100644
index 000000000000..a670e99c372f
--- /dev/null
+++ b/sci-electronics/eagle/files/eagle_wrapper_script
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# From http://www.cadsoft.de/faq.htm#17040701
+# Work around problems with the Composite X extension
+export XLIB_SKIP_ARGB_VISUALS=1
+
+# The ebuild will append the final line respecting INSTALLDIR
+# Default is /opt/eagle/bin/eagle