diff options
| -rw-r--r-- | sci-electronics/gerbmerge/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/Manifest | 11 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch | 21 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-setup.patch | 100 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/files/gerbmerge-1.8-launcher.py | 3 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/gerbmerge-1.6.ebuild | 2 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/gerbmerge-1.8.ebuild | 50 | ||||
| -rw-r--r-- | sci-electronics/gerbmerge/metadata.xml | 4 |
8 files changed, 192 insertions, 7 deletions
diff --git a/sci-electronics/gerbmerge/ChangeLog b/sci-electronics/gerbmerge/ChangeLog index d7b21a78c..1823a0983 100644 --- a/sci-electronics/gerbmerge/ChangeLog +++ b/sci-electronics/gerbmerge/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for sci-electronics/gerbmerge -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Sep 2011; Christopher Head (Hawk777) <headch@gmail.com> + gerbmerge-1.6.ebuild, +gerbmerge-1.8.ebuild, + +files/gerbmerge-1.8-fix-main.patch, +files/gerbmerge-1.8-fix-setup.patch, + +files/gerbmerge-1.8-launcher.py, metadata.xml: + Version bump to sci-electronics/gerbmerge-1.8. + 20 Oct 2010; Christopher Head (Hawk777) <headch@gmail.com> +gerbmerge-1.6.ebuild, +files/gerbmerge-1.6-no-fixperms.patch, +metadata.xml: diff --git a/sci-electronics/gerbmerge/Manifest b/sci-electronics/gerbmerge/Manifest index bf1a59c5c..13ea93599 100644 --- a/sci-electronics/gerbmerge/Manifest +++ b/sci-electronics/gerbmerge/Manifest @@ -1,5 +1,10 @@ AUX gerbmerge-1.6-no-fixperms.patch 1455 RMD160 3ad45cf987c0f836e6cf2d5fcdd8243c7785b697 SHA1 8a7b70211478f42f601b751502f4983bb545cbb5 SHA256 487030f294cc8d5a1574d0f51382a478b032a8ccec97e96e7a1c6d8a457f5cb8 +AUX gerbmerge-1.8-fix-main.patch 736 RMD160 7aa1957c3d62e48b5dfc5cfd9484bf06033bcb19 SHA1 bfbb39248b3e99e34402e5e8979308a352d8b19a SHA256 c43356e0bd1a3c1b9756df2b00c74583a98f45223c3a069b821100aeb2461adb +AUX gerbmerge-1.8-fix-setup.patch 3046 RMD160 0a6b73540b87cf9771b448fda103a585a0e6ac4d SHA1 766332ab6cf94747a7d6179a37abc768b217d52d SHA256 84fefb69c180fbc55aa9cf2ceb1a9b767707900c16d5b1e53c81702004db9b2b +AUX gerbmerge-1.8-launcher.py 76 RMD160 cf55632f634212bd470b1586f058fea2fe0025e7 SHA1 8ba56e866e0cb4d9a97260b06f7031cbd13002e9 SHA256 eb0626dd1067fdffef7636fdd3cf39b439e2419a4714a17b167aea692ee9b758 DIST gerbmerge-1.6.tar.gz 428478 RMD160 a792ba967ce2d7bcbc6c2afbc32ccf556f0bf400 SHA1 72134925c7a128df153612eab4f15986e9cd3d8a SHA256 a4e22612a65665c028faa4baf0c84657dd2e0e7a9b0a68422f184c5e0863acca -EBUILD gerbmerge-1.6.ebuild 1456 RMD160 f16c7338c3deaddf063c54784537b41eacae2d02 SHA1 6f044ecaa56870cb77916cc8ea43aa7b286ed772 SHA256 cd77ba818ab7c8d16ad00039b9d8d23155d351bbd0004e75cf679e38945f56b0 -MISC ChangeLog 298 RMD160 4c4aa25b814dcae4b573f5fa8de3586123e23532 SHA1 63541d301dd2cea90ec40fe8147e0acf8425c91f SHA256 815fc8efa99af9e57d81c6ab2d544c12c6377286370a3dcf3fc20a7825947e36 -MISC metadata.xml 472 RMD160 2fe2072dcb663a26eef07afbc486ad0de9cec52b SHA1 4d3efdac7c4d9629af9916fe30ffd80be0ef3f53 SHA256 3429dd60bd3441b107fdabe09a737474748ddb3255be5410fa0b27296ebd9882 +DIST gerbmerge-1.8.tar.gz 860155 RMD160 1429b4fbbebb40491cfb94690eaa0d6698ea619d SHA1 6f2a756dfc31bc6648e03e8a2c7dee01e3b17119 SHA256 ad1a4e5ae7b42ea543acc71151068e056312f57a8b13fa2e42cbf80f04ce8821 +EBUILD gerbmerge-1.6.ebuild 1456 RMD160 f5e9393a87181ee937e98eeb0812a86b53e41b5d SHA1 c08120555fb16ae8d9cd641184003df7834c3aa6 SHA256 1c06485ced1ed4667a22bf0f0e405dfdac16eb0d25743c79ef223f4d427da184 +EBUILD gerbmerge-1.8.ebuild 1402 RMD160 ac077702ab8b3cc90b2314e4fa8f6942619bbf26 SHA1 813be90222688fba34cfae213802b23e898b82fa SHA256 1ad9ca68581aff4be089f23bcf2e52607b84556ab7649454fb8955787a026e20 +MISC ChangeLog 583 RMD160 bf052eac40c9371644f8d5f570e1673715649317 SHA1 c199fde332df598375663f7086ef1839ed926663 SHA256 2982107e6aed6caa401bfeedf685b4b4ec0bc751da22582f96f2cdc3ea421a9b +MISC metadata.xml 468 RMD160 82b39f698ddb87886b95814d21fb3b38be7e0a53 SHA1 c5619447fcc06f4e36db671b2b98a3cb84cc44c0 SHA256 0b2eddb83bd452cd361ca54c3bab632e172f9cbf930fb99c64b4e5bf09913b15 diff --git a/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch b/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch new file mode 100644 index 000000000..6e51f61b1 --- /dev/null +++ b/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch @@ -0,0 +1,21 @@ +diff --git a/gerbmerge/gerbmerge.py b/gerbmerge/gerbmerge.py +index 149baca..e3866fc 100644 +--- a/gerbmerge/gerbmerge.py ++++ b/gerbmerge/gerbmerge.py +@@ -719,7 +719,7 @@ def updateGUI(text = None): + if GUI != None: + GUI.updateProgress(text) + +-if __name__=="__main__": ++def main(): + try: + opts, args = getopt.getopt(sys.argv[1:], 'hv', ['help', 'version', 'octagons=', 'random-search', 'full-search', 'rs-fsjobs=', 'search-timeout=', 'place-file=', 'no-trim-gerber', 'no-trim-excellon']) + except getopt.GetoptError: +@@ -750,4 +750,7 @@ http://ruggedcircuits.com/gerbmerge + disclaimer() + + sys.exit(merge(opts, args)) ## run germberge ++ ++if __name__=="__main__": ++ main() + # vim: expandtab ts=2 sw=2 ai syntax=python diff --git a/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-setup.patch b/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-setup.patch new file mode 100644 index 000000000..ead8b7121 --- /dev/null +++ b/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-setup.patch @@ -0,0 +1,100 @@ +diff --git a/setup.py b/setup.py +index ea39091..6c6f8cc 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,7 +1,5 @@ + #!/usr/bin/env python + import sys +-import glob +-import os + + from distutils.core import setup, Extension + import distutils.sysconfig +@@ -24,32 +22,6 @@ if 0: + + sys.exit(0) + +-SampleFiles = glob.glob('testdata/*') +-DocFiles = glob.glob('doc/*') +-AuxFiles = ['COPYING'] +- +-if sys.platform == 'win32' or ('bdist_wininst' in sys.argv): +- #DestLib = distutils.sysconfig.get_config_var('prefix') +- #DestDir = os.path.join(DestLib, 'gerbmerge') +- #BinDir = DestLib +- DestLib = '.' +- DestDir = os.path.join(DestLib, 'gerbmerge') +- BinFiles = ['misc/gerbmerge.bat'] +- BinDir = '.' +-else: +- DestLib = distutils.sysconfig.get_config_var('LIBPYTHON') +- DestDir = os.path.join(DestLib, 'gerbmerge') +- BinFiles = ['misc/gerbmerge'] +- BinDir = distutils.sysconfig.get_config_var('BINDIR') +- +- # Create top-level invocation program +- fid = file('misc/gerbmerge', 'wt') +- fid.write( \ +- r"""#!/bin/sh +-python %s/site-packages/gerbmerge/gerbmerge.py $* +- """ % DestLib) +- fid.close() +- + dist=setup (name = "gerbmerge", + license = "GPL", + version = "%d.%d" % (VERSION_MAJOR, VERSION_MINOR), +@@ -73,53 +45,6 @@ URL below. + author_email = "support@ruggedcircuits.com", + url = "http://ruggedcircuits.com/gerbmerge", + packages = ['gerbmerge'], ++ scripts = ['misc/gerbmerge'], + platforms = ['all'], +- data_files = [ (DestDir, AuxFiles), +- (os.path.join(DestDir,'testdata'), SampleFiles), +- (os.path.join(DestDir,'doc'), DocFiles), +- (BinDir, BinFiles) ] + ) +- +-do_fix_perms = 0 +-if sys.platform != "win32": +- for cmd in dist.commands: +- if cmd[:7]=='install': +- do_fix_perms = 1 +- break +- +-if do_fix_perms: +- # Ensure package files and misc/help files are world readable-searchable. +- # Shouldn't Distutils do this for us? +- print 'Setting permissions on installed files...', +- try: +- def fixperms(arg, dirname, names): +- os.chmod(dirname, 0755) +- for name in names: +- fullname = os.path.join(dirname, name) +- if os.access(fullname, os.X_OK): +- os.chmod(fullname, 0755) +- else: +- os.chmod(fullname, 0644) +- +- os.path.walk(DestDir, fixperms, 1) +- os.path.walk(os.path.join(DestLib, 'site-packages/gerbmerge'), fixperms, 1) +- +- os.chmod(os.path.join(BinDir, 'gerbmerge'), 0755) +- print 'done' +- except: +- print 'FAILED' +- print +- print '*** Please verify that the installed files have correct permissions. On' +- print "*** systems without permission flags, you don't need to" +- print '*** worry about it.' +- +-if cmd[:7]=='install': +- print +- print '******** Installation Complete ******** ' +- print +- print 'Sample files and documentation have been installed in:' +- print ' ', DestDir +- print +- print 'A shortcut to starting the program has been installed as:' +- print ' ', os.path.join(BinDir, 'gerbmerge') +- print diff --git a/sci-electronics/gerbmerge/files/gerbmerge-1.8-launcher.py b/sci-electronics/gerbmerge/files/gerbmerge-1.8-launcher.py new file mode 100644 index 000000000..bfc5ce980 --- /dev/null +++ b/sci-electronics/gerbmerge/files/gerbmerge-1.8-launcher.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python +import gerbmerge.gerbmerge +gerbmerge.gerbmerge.main() diff --git a/sci-electronics/gerbmerge/gerbmerge-1.6.ebuild b/sci-electronics/gerbmerge/gerbmerge-1.6.ebuild index 3781b2176..4de7c70b7 100644 --- a/sci-electronics/gerbmerge/gerbmerge-1.6.ebuild +++ b/sci-electronics/gerbmerge/gerbmerge-1.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ diff --git a/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild b/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild new file mode 100644 index 000000000..9f3d65e41 --- /dev/null +++ b/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils eutils + +DESCRIPTION="A program for combining (panelizing) Gerber/Excellon files" +HOMEPAGE="http://ruggedcircuits.com/gerbmerge/" +SRC_URI="http://ruggedcircuits.com/gerbmerge/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc examples" + +DEPEND="dev-python/simpleparse" +RDEPEND="${DEPEND}" + +src_prepare() { + # This package has a very, very messy distutils situation. This patch rips + # out most of setup.py and replaces it with something simpler. + epatch "${FILESDIR}/${P}-fix-setup.patch" + + # This adds a "main" function to the toplevel module in the gerbmerge Python + # package, which allows the function to be called from a launcher script + # (otherwise it would expect to be invoked directly while having been + # installed in site-packages). + epatch "${FILESDIR}/${P}-fix-main.patch" + + # Throw a very simple launcher script into the mix. + cp "${FILESDIR}/${P}-launcher.py" "${S}/misc/gerbmerge" || die + + distutils_src_prepare +} + +src_install() { + distutils_src_install + if use doc; then + dohtml -A cfg -A def doc/* || die "Failed to install documentation" + fi + if use examples; then + docinto testdata + dodoc testdata/* || die "Failed to install examples" + fi +} diff --git a/sci-electronics/gerbmerge/metadata.xml b/sci-electronics/gerbmerge/metadata.xml index 2807ce350..9cde8504a 100644 --- a/sci-electronics/gerbmerge/metadata.xml +++ b/sci-electronics/gerbmerge/metadata.xml @@ -8,8 +8,8 @@ <longdescription>A program for combining (panelizing) Gerber/Excellon files</longdescription> <upstream> <maintainer> - <email>steriana@claymore.engineer.gvsu.edu</email> - <name>Andrew Sterian</name> + <email>support@ruggedcircuits.com</email> + <name>Rugged Circuits LLC</name> </maintainer> </upstream> </pkgmetadata> |