Revision bump and cleanup of old ebuilds. Also modified the warning at the end of installation to be a little more severe per UPDATE_en.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.22-ck1 x86_64

5 files changed, 111 insertions, 89 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index 682490787994..a0f7222c6bfd 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-electronics/eagle
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.13 2008/07/17 00:12:09 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.14 2008/10/02 02:43:17 nixphoeni Exp $
+
+*eagle-5.2.0 (02 Oct 2008)
+
+  02 Oct 2008; Joe Sapp <nixphoeni@gentoo.org> -eagle-4.16_p1.ebuild,
+  eagle-5.1.0.ebuild, +eagle-5.2.0.ebuild:
+  Revision bump. Also modified the warning at the end of installation to be
+  a little more severe per UPDATE_en.
+  Thanks to Alex <nabrozidhs@gmail.com> on bug #235380 for notifying me.
+  Cleaned up old ebuilds a little too.
 
   17 Jul 2008; Joe Sapp <nixphoeni@gentoo.org> ChangeLog:
   Revised ebuild for eagle version 5, which uses a new packaging system and
diff --git a/sci-electronics/eagle/Manifest b/sci-electronics/eagle/Manifest
index bbf262a5e6a6..97efbea10875 100644
--- a/sci-electronics/eagle/Manifest
+++ b/sci-electronics/eagle/Manifest
@@ -1,16 +1,13 @@
 AUX eagle_wrapper_script 247 RMD160 14d9b81df8cfc4bd414a112d0b1f1e505605896a SHA1 0d2a39f3709358b658da8f908277cc43a6d46aa0 SHA256 a34c628f4e8bceefc6f08fa2c0a74888fa660e4fc0bd669b8092476581db2758
-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
 DIST cadsoft_eagle_manual-ger-2006.12.13.pdf 3178176 RMD160 79e021301507e12fefec3d227f0e3a495f12b42b SHA1 3cecdb01c8f0fa8b85b5dfb83b49e52141eabba6 SHA256 1b2bba3af2bfa14194a17aa0218101f934204e54b207c0617b7d86a522ea55cd
 DIST eagle-lin-5.1.0.run 25124088 RMD160 fcd535c180e84e93c12bcb60abecfe7dd4e39ef1 SHA1 c2c034510db362b951af856a4d61a564848476c7 SHA256 b6fa8b46e78d9e7734f8b37af0f8e7eae6edfd566330fa8902c9c76d55850669
-DIST eagle-lin-eng-4.16r1.tgz 8595252 RMD160 a7ebd46e1699da846c397df1a068daf2eca338fb SHA1 e43f79ad9249fe71dc2580d21dc4ca116c03e700 SHA256 c9a7f63b3642fcf0b8130354c2e3ea263cc7160aef8205e9d1fc0a8ebccdb6de
+DIST eagle-lin-5.2.0.run 25375570 RMD160 b1e885263226a06d961b4c8302ae72f599910144 SHA1 fb50076ab824612a9b545ed6d47247db3f4d7a63 SHA256 87ce2186c13e332907ba764f1bc1371d10efb177709ceae82bac8a4fbecda3af
 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 1965 RMD160 6ba8bfe1b0b127b2ec4205522f060267b64b317d SHA1 5bad9b7c47d87c95dc01f15f3fa1a6b958df59c0 SHA256 8a650459f55eff1119be777f62f16c6cfabc706a6dfd88c1f1532324f5bf1bba
 EBUILD eagle-4.16_p2-r2.ebuild 2615 RMD160 721c708f73c1651ceeae13cf947c178cbca6f7e7 SHA1 add65932f1f2bbe069e15d570d2cee67c37f1ae3 SHA256 324152fd8190f7a7bb6fcb96b28ffb19f331c6fd232d99b5f5e6147cbb3581a3
 EBUILD eagle-4.16_p2.ebuild 2226 RMD160 8afeca0eef867f860dc454a032b343b73cbd1227 SHA1 7a5de9988963cb564c7a56dacbd45f08859982a7 SHA256 296d6c33424bf581be88686cc3056cab87f563c0f275847ff90837eb22db885f
-EBUILD eagle-5.1.0.ebuild 2398 RMD160 b355d6685162b2c08acae20986399c52d13ccb12 SHA1 66f34f8faf639e311a183b029d8c4d23bee0b4e3 SHA256 46d86b75f0268f95c6165a79b611836e3a21f32f3cc00e63374bf10fa5783bea
-MISC ChangeLog 2570 RMD160 22c85267a06dd25921ec9f186ac94a6d72db615e SHA1 a047388547c530be71813fc846773590a05115a2 SHA256 ab7eec7c03385a8423699d884622985d5014658188eb41dd43bfb67fa0a4c68b
+EBUILD eagle-5.1.0.ebuild 2590 RMD160 1add403e2c4055fe2e02b91de2297dcf53e0b4d1 SHA1 42bdf083fd957ed2ed9302567c4663317dd99c5d SHA256 8047efadd4705dfd18f41e41c27e2a39356fca3258e2a3243fb5bd9e7b6f6124
+EBUILD eagle-5.2.0.ebuild 2589 RMD160 5ca22c4b5fafcffb06ca457c11be43891a809f2e SHA1 2c5f4a7d4c55f52d81e618106a6aa69ce640f106 SHA256 7f8d72501a84ae65498c26ace8ad977308396a3a504a918b73b9a06a3c9bed7a
+MISC ChangeLog 2938 RMD160 3fcef8b894ecb42fa9aafb48a47f7d8848974477 SHA1 8afff6993e7a77477a4ba0d2dbbdb2aa8fd961e5 SHA256 00bf518608313647da4a96c6c5ed9d0520dbf058af11b95561a7e943149ea287
 MISC metadata.xml 650 RMD160 94bb3ebbd80b6819de3fca30d1da3a7c986fc130 SHA1 013c84de6fcea30c6313af7f0841d3c3ced1cc1b SHA256 474e9463b0e4fd66eac3d290fa4a8ba7b98c49ce42e085d4b7f2a6a2573c4642
diff --git a/sci-electronics/eagle/eagle-4.16_p1.ebuild b/sci-electronics/eagle/eagle-4.16_p1.ebuild
deleted file mode 100644
index b41bd72c9d3d..000000000000
--- a/sci-electronics/eagle/eagle-4.16_p1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 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.7 2008/02/29 20:38:42 carlo 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"
-MANVER="2006.04.03"
-
-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 the documentation
-	dodoc README doc/*
-	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
-
-	echo -e "PATH=${INSTALLDIR}/bin\nROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}"/90eagle
-	doenvd "${S}"/90eagle
-
-	# Create desktop entry
-	doicon bin/${PN}.xpm
-	make_desktop_entry ${PN} ${PN} ${PN} "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-5.1.0.ebuild b/sci-electronics/eagle/eagle-5.1.0.ebuild
index 36fe72dfe1c0..abbf31005947 100644
--- a/sci-electronics/eagle/eagle-5.1.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.1.0.ebuild,v 1.1 2008/07/17 00:12:09 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.1.0.ebuild,v 1.2 2008/10/02 02:43:17 nixphoeni Exp $
 
 inherit eutils
 
@@ -81,7 +81,11 @@ 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."
-	elog
-	elog "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 4.xx."
+	echo
+	ewarn "Due to some necessary changes in the data structure, once you edit"
+	ewarn "a file with version 5.x you will no longer be able to edit it"
+	ewarn "with versions prior to 5.0!"
+	ewarn
+	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 4.xx."
 
 }
diff --git a/sci-electronics/eagle/eagle-5.2.0.ebuild b/sci-electronics/eagle/eagle-5.2.0.ebuild
new file mode 100644
index 000000000000..60bc0563b7aa
--- /dev/null
+++ b/sci-electronics/eagle/eagle-5.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.2.0.ebuild,v 1.1 2008/10/02 02:43:17 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"
+
+# Cadsoft has used the suffix "_p" in the past which we translate to "r"
+MY_PV=${PV/_p/r}
+
+SRC_URI="ftp://ftp.cadsoft.de/pub/program/${PV%\.[0-9]}/${PN}-lin-${MY_PV}.run"
+
+RDEPEND="sys-libs/glibc
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp"
+
+# Append ${PV} since that's what upstream installs to
+INSTALLDIR="/opt/eagle-${PV}"
+case "${LINGUAS}" in
+	*de*)
+		MY_LANG="de";;
+	*)
+		MY_LANG="en";;
+esac
+# Mandatory documentation being installed
+DOCS="README_${MY_LANG} UPDATE_${MY_LANG} library_${MY_LANG}.txt"
+
+src_unpack() {
+
+	# Extract the built-in .tar.bz2 file starting at __DATA__
+	sed  -e '1,/^__DATA__$/d' "${DISTDIR}/${A}" | tar xj || die "unpacking failed"
+
+}
+
+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 and any
+	# arguments passed to the script (thanks Denilson)
+	echo "${INSTALLDIR}/bin/eagle" '"$@"' >> "${D}/usr/bin/eagle"
+
+	# Install the documentation
+	cd doc
+	dodoc ${DOCS}
+	# Install extra documentation if requested
+	use doc && dodoc elektro-tutorial.pdf manual_${MY_LANG}.pdf tutorial_${MY_LANG}.pdf
+	doman eagle.1
+	# Remove docs left in INSTALLDIR
+	rm -rf "${D}${INSTALLDIR}/doc/*"
+	cd ..
+
+	echo -e "ROOTPATH=${INSTALLDIR}/bin\nPRELINK_PATH_MASK=${INSTALLDIR}" > "${S}/90eagle"
+	doenvd "${S}/90eagle"
+
+	# Create desktop entry
+	doicon bin/${PN}icon50.png
+	make_desktop_entry "${ROOT}/usr/bin/eagle" ${PN} ${PN}icon50.png "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."
+	echo
+	ewarn "Due to some necessary changes in the data structure, once you edit"
+	ewarn "a file with version 5.x you will no longer be able to edit it"
+	ewarn "with versions prior to 5.0!"
+	ewarn
+	ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 4.xx."
+}