Fixed dependencies for amd64 (bug #277894), removed oldest stable ebuild in the 5.x series since there is a newer stable version (5.4.0)

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 18 insertions, 98 deletions

diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog
index 1c79ac8cce71..31bc137d7934 100644
--- a/sci-electronics/eagle/ChangeLog
+++ b/sci-electronics/eagle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/eagle
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.25 2009/05/13 01:09:21 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.26 2009/07/24 03:59:14 nixphoeni Exp $
+
+  24 Jul 2009; Joe Sapp <nixphoeni@gentoo.org> eagle-4.16_p2-r2.ebuild,
+  -eagle-5.3.0.ebuild, eagle-5.4.0.ebuild, eagle-5.6.0.ebuild:
+  Fixed dependencies for amd64 (bug #277894), removed oldest stable
+  ebuild in the 5.x series since there is a newer stable version
 
   13 May 2009; Joe Sapp <nixphoeni@gentoo.org> -eagle-5.5.0.ebuild:
   Removed previous version, which was still unstable until about halfway
diff --git a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
index bcbd3023770f..897c82e70c30 100644
--- a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
+++ b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r2.ebuild,v 1.4 2009/03/12 16:03:21 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild,v 1.5 2009/07/24 03:59:14 nixphoeni Exp $
 
 inherit eutils
 
@@ -33,7 +33,9 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
-	x11-libs/libXdmcp"
+	x11-libs/libXdmcp
+	amd64? ( app-emulation/emul-linux-x86-baselibs
+		 app-emulation/emul-linux-x86-xlibs )"
 
 INSTALLDIR="/opt/eagle"
 case "${LINGUAS}" in
diff --git a/sci-electronics/eagle/eagle-5.3.0.ebuild b/sci-electronics/eagle/eagle-5.3.0.ebuild
deleted file mode 100644
index 496219085985..000000000000
--- a/sci-electronics/eagle/eagle-5.3.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.3.0.ebuild,v 1.3 2009/03/12 16:03:21 nixphoeni Exp $
-
-inherit eutils
-
-DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) 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}
-	doman eagle.1
-	# Install extra documentation if requested
-	use doc && dodoc elektro-tutorial.pdf manual_${MY_LANG}.pdf tutorial_${MY_LANG}.pdf
-	# 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."
-
-}
diff --git a/sci-electronics/eagle/eagle-5.4.0.ebuild b/sci-electronics/eagle/eagle-5.4.0.ebuild
index cbfc4ea0fc8e..1ae2dc0334e8 100644
--- a/sci-electronics/eagle/eagle-5.4.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.4.0.ebuild,v 1.3 2009/03/15 18:08:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.4.0.ebuild,v 1.4 2009/07/24 03:59:14 nixphoeni Exp $
 
 inherit eutils
 
@@ -22,7 +22,9 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
-	x11-libs/libXdmcp"
+	x11-libs/libXdmcp
+	amd64? ( app-emulation/emul-linux-x86-baselibs
+		 app-emulation/emul-linux-x86-xlibs )"
 
 # Append ${PV} since that's what upstream installs to
 INSTALLDIR="/opt/eagle-${PV}"
diff --git a/sci-electronics/eagle/eagle-5.6.0.ebuild b/sci-electronics/eagle/eagle-5.6.0.ebuild
index 3894a5035a8a..f1242b4d481b 100644
--- a/sci-electronics/eagle/eagle-5.6.0.ebuild
+++ b/sci-electronics/eagle/eagle-5.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.6.0.ebuild,v 1.1 2009/05/12 02:15:23 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.6.0.ebuild,v 1.2 2009/07/24 03:59:14 nixphoeni Exp $
 
 inherit eutils
 
@@ -22,7 +22,9 @@ RDEPEND="sys-libs/glibc
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
-	x11-libs/libXdmcp"
+	x11-libs/libXdmcp
+	amd64? ( app-emulation/emul-linux-x86-baselibs
+		 app-emulation/emul-linux-x86-xlibs )"
 
 # Append ${PV} since that's what upstream installs to
 INSTALLDIR="/opt/eagle-${PV}"