diff options
| -rw-r--r-- | sci-electronics/eagle/ChangeLog | 11 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-4.16_p2-r2.ebuild | 92 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-5.11.0.ebuild | 4 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-5.12.0.ebuild | 3 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-6.6.0.ebuild | 3 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-7.2.0.ebuild | 98 | ||||
| -rw-r--r-- | sci-electronics/eagle/eagle-7.3.0.ebuild (renamed from sci-electronics/eagle/eagle-7.1.0.ebuild) | 88 |
7 files changed, 75 insertions, 224 deletions
diff --git a/sci-electronics/eagle/ChangeLog b/sci-electronics/eagle/ChangeLog index 0a4debc41b1d..fe68e4275723 100644 --- a/sci-electronics/eagle/ChangeLog +++ b/sci-electronics/eagle/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-electronics/eagle # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.67 2015/06/14 18:51:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/ChangeLog,v 1.68 2015/07/11 22:20:49 idl0r Exp $ + +*eagle-7.3.0 (11 Jul 2015) + + 11 Jul 2015; Christian Ruppert <idl0r@gentoo.org> -eagle-4.16_p2-r2.ebuild, + eagle-5.11.0.ebuild, eagle-5.12.0.ebuild, eagle-6.6.0.ebuild, + -eagle-7.1.0.ebuild, -eagle-7.2.0.ebuild, +eagle-7.3.0.ebuild: + Version bump. Add new license for 7.3.0. Add RESTRICT="mirror bindist" due to + license restrictions, thanks to Ulrich Müller <ulm@gentoo.org>! Cleanup. + Also fixes bug 545064. 14 Jun 2015; Ulrich Müller <ulm@gentoo.org> eagle-4.16_p2-r2.ebuild, eagle-5.11.0.ebuild, eagle-5.12.0.ebuild, eagle-6.6.0.ebuild, diff --git a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild b/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild deleted file mode 100644 index a1067c2228b1..000000000000 --- a/sci-electronics/eagle/eagle-4.16_p2-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2015 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.9 2015/06/14 18:51:43 ulm Exp $ - -EAPI=5 - -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" - -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[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXau[abi_x86_32(-)] - x11-libs/libXdmcp[abi_x86_32(-)] -" - -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() { - dodir ${INSTALLDIR} - # Copy all to INSTALLDIR - cp -r . "${D}"/${INSTALLDIR} || die - - # Install wrapper (suppressing leading tabs) - # see bug #188368 or http://www.cadsoft.de/faq.htm#17040701 - newbin "${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 - 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" || die - - 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} "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.11.0.ebuild b/sci-electronics/eagle/eagle-5.11.0.ebuild index 3144083e1170..fc3b0f3afb3d 100644 --- a/sci-electronics/eagle/eagle-5.11.0.ebuild +++ b/sci-electronics/eagle/eagle-5.11.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.8 2015/06/14 18:51:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.11.0.ebuild,v 1.9 2015/07/11 22:20:49 idl0r Exp $ EAPI=5 @@ -12,7 +12,7 @@ HOMEPAGE="http://www.cadsoft.de" KEYWORDS="amd64 x86" IUSE="doc linguas_de linguas_zh" LICENSE="cadsoft" -RESTRICT="strip test" +RESTRICT="strip test mirror bindist" SLOT="0" SRC_URI="ftp://ftp.cadsoft.de/eagle/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run" diff --git a/sci-electronics/eagle/eagle-5.12.0.ebuild b/sci-electronics/eagle/eagle-5.12.0.ebuild index 3a80eab65b0c..6f3f52a51e45 100644 --- a/sci-electronics/eagle/eagle-5.12.0.ebuild +++ b/sci-electronics/eagle/eagle-5.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.4 2015/06/14 18:51:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-5.12.0.ebuild,v 1.5 2015/07/11 22:20:49 idl0r Exp $ EAPI="5" @@ -16,6 +16,7 @@ LICENSE="cadsoft" SLOT="0" QA_PREBUILT="opt/${P}/bin/eagle" +RESTRICT="mirror bindist" RDEPEND=" sys-libs/glibc diff --git a/sci-electronics/eagle/eagle-6.6.0.ebuild b/sci-electronics/eagle/eagle-6.6.0.ebuild index b0a1bbbc36de..b27680e3473f 100644 --- a/sci-electronics/eagle/eagle-6.6.0.ebuild +++ b/sci-electronics/eagle/eagle-6.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.6.0.ebuild,v 1.3 2015/06/14 18:51:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-6.6.0.ebuild,v 1.4 2015/07/11 22:20:49 idl0r Exp $ EAPI="5" @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86 -*" IUSE="doc linguas_de linguas_zh" QA_PREBUILT="opt/eagle/bin/eagle" +RESTRICT="mirror bindist" RDEPEND=" sys-libs/glibc diff --git a/sci-electronics/eagle/eagle-7.2.0.ebuild b/sci-electronics/eagle/eagle-7.2.0.ebuild deleted file mode 100644 index a1a1ce51583d..000000000000 --- a/sci-electronics/eagle/eagle-7.2.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.2.0.ebuild,v 1.4 2015/06/14 18:51:43 ulm Exp $ - -EAPI="5" - -inherit eutils - -DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor" -HOMEPAGE="http://www.cadsoft.de" -SRC_URI="ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run" - -LICENSE="cadsoft" -SLOT="0" -KEYWORDS="~amd64 ~x86 -*" -IUSE="doc linguas_de linguas_zh" - -QA_PREBUILT="opt/eagle/bin/eagle" - -RDEPEND=" - sys-libs/glibc - dev-libs/openssl:0[abi_x86_32(-)] - >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXi-1.7.2[abi_x86_32(-)] -" - -# Append ${PV} since that's what upstream installs to -case "${LINGUAS}" in - *de*) - MY_LANG="de";; - *) - MY_LANG="en";; -esac - -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() { - local installdir="/opt/eagle" - - # Set MY_LANG for this function only since UPDATE_zh and README_zh - # don't exist - [[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}" - - insinto $installdir - doins -r . - - fperms 0755 ${installdir}/bin/eagle - - # Install wrapper (suppressing leading tabs) - # see bug #188368 or http://www.cadsoftusa.com/training/faq/#3 - exeinto /opt/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}/opt/bin/eagle" - - # Install the documentation - cd doc - dodoc README_${MY_LANG} UPDATE_${MY_LANG} library_${MY_LANG}.txt - doman eagle.1 - - # Install extra documentation if requested - if use doc; then - dodoc {connect-device-split-symbol-${MY_INST_LANG},elektro-tutorial,manual_${MY_INST_LANG},tutorial_${MY_INST_LANG},layer-setup_designrules}.pdf - fi - # Remove docs left in $installdir - rm -rf "${D}${installdir}/doc" - cd "${S}" - - echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}" - doenvd "${S}/90eagle-${PV}" - - # Create desktop entry - newicon bin/${PN}icon50.png ${PF}-icon50.png - make_desktop_entry "${ROOT}/opt/bin/eagle" "CadSoft EAGLE Layout Editor" ${PF}-icon50 "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 7.x you will no longer be able to edit it" - ewarn "with versions prior to 7.0!" - ewarn - ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 6.x/5.x/4.x." -} diff --git a/sci-electronics/eagle/eagle-7.1.0.ebuild b/sci-electronics/eagle/eagle-7.3.0.ebuild index b7bf9e257ce9..c803ae80fd09 100644 --- a/sci-electronics/eagle/eagle-7.1.0.ebuild +++ b/sci-electronics/eagle/eagle-7.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.1.0.ebuild,v 1.3 2015/06/14 18:51:43 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/eagle/eagle-7.3.0.ebuild,v 1.1 2015/07/11 22:20:49 idl0r Exp $ EAPI="5" @@ -8,29 +8,32 @@ inherit eutils DESCRIPTION="CadSoft EAGLE schematic and printed circuit board (PCB) layout editor" HOMEPAGE="http://www.cadsoft.de" -SRC_URI="ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin-${PV}.run" +SRC_URI=" + x86? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin32-${PV}.run ) + amd64? ( ftp://ftp.cadsoft.de/${PN}/program/${PV%\.[0-9]}/${PN}-lin64-${PV}.run )" -LICENSE="cadsoft" +LICENSE="cadsoft-2" SLOT="0" KEYWORDS="~amd64 ~x86 -*" IUSE="doc linguas_de linguas_zh" QA_PREBUILT="opt/eagle/bin/eagle" +RESTRICT="mirror bindist" RDEPEND=" sys-libs/glibc - || ( virtual/jpeg:62[abi_x86_32(-)] media-libs/jpeg:62[abi_x86_32(-)] ) - >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] - >=dev-libs/openssl-0.9.8z_p1-r2:0.9.8[abi_x86_32(-)] - >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] - >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + dev-libs/openssl:0 + >=sys-libs/zlib-1.2.8-r1 + >=media-libs/freetype-2.5.0.1 + >=media-libs/fontconfig-2.10.92 + x11-libs/libXext + x11-libs/libX11 + >=x11-libs/libXrender-0.9.8 + >=x11-libs/libXrandr-1.4.2 + >=x11-libs/libXcursor-1.1.14 + >=x11-libs/libXi-1.7.2 + net-print/cups + x11-libs/libxcb " # Append ${PV} since that's what upstream installs to @@ -53,6 +56,46 @@ src_install() { # don't exist [[ ${LINGUAS} == *zh* ]] && MY_INST_LANG="zh" || MY_INST_LANG="${MY_LANG}" + # Install the documentation + cd doc/ + + local pattern="^((README|UPDATE)_${MY_LANG}|library_${MY_LANG}\.txt)$" + for docs in README_* UPDATE_* library_*.txt; do + if [[ $docs =~ $pattern ]]; then + dodoc $docs + fi + + rm -f $docs + done + + doman eagle.1 + rm eagle.1 + + # Install extra documentation if requested + pattern="^((tutorial|manual|generate-3d-idf-data)_|(connect-device-split-symbol|make-symbol-device-package-bsdl-2011)-)${MY_LANG}.pdf$" + if use doc; then + cd ulp/ + for docs in generate-3d-idf-data_*.pdf connect-device-split-symbol-*.pdf make-symbol-device-package-bsdl-2011-*.pdf; do + if [[ ! $docs =~ $pattern ]]; then + rm $docs + fi + done + cd ../ + + for docs in manual_* tutorial_*; do + if [[ ! $docs =~ $pattern ]]; then + rm $docs + fi + done + else + rm {elektro-tutorial,manual_*,tutorial_*,layer-setup_designrules}.pdf + rm -rf ulp/ + fi + + rm -f license*.txt eagle.dtd + + cd "${S}" + insinto $installdir doins -r . @@ -66,19 +109,6 @@ src_install() { # arguments passed to the script (thanks Denilson) echo "${installdir}/bin/eagle" '"$@"' >> "${D}/opt/bin/eagle" - # Install the documentation - cd doc - dodoc README_${MY_LANG} UPDATE_${MY_LANG} library_${MY_LANG}.txt - doman eagle.1 - - # Install extra documentation if requested - if use doc; then - dodoc {connect-device-split-symbol-${MY_INST_LANG},elektro-tutorial,manual_${MY_INST_LANG},tutorial_${MY_INST_LANG},layer-setup_designrules}.pdf - fi - # Remove docs left in $installdir - rm -rf "${D}${installdir}/doc" - cd "${S}" - echo -e "ROOTPATH=${installdir}/bin\nPRELINK_PATH_MASK=${installdir}" > "${S}/90eagle-${PV}" doenvd "${S}/90eagle-${PV}" @@ -96,5 +126,5 @@ pkg_postinst() { ewarn "a file with version 7.x you will no longer be able to edit it" ewarn "with versions prior to 7.0!" ewarn - ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from 6.x/5.x/4.x." + ewarn "Please read /usr/share/doc/${PF}/UPDATE_${MY_LANG} if you are upgrading from a version prior 7.x!" } |