diff options
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/gerbmerge/ChangeLog | 19 | ||||
-rw-r--r-- | sci-electronics/gerbmerge/Manifest | 8 | ||||
-rw-r--r-- | sci-electronics/gerbmerge/files/gerbmerge-1.6-no-fixperms.patch | 51 | ||||
-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.8.ebuild | 50 | ||||
-rw-r--r-- | sci-electronics/gerbmerge/metadata.xml | 14 |
8 files changed, 0 insertions, 266 deletions
diff --git a/sci-electronics/gerbmerge/ChangeLog b/sci-electronics/gerbmerge/ChangeLog deleted file mode 100644 index 76d1f0b78..000000000 --- a/sci-electronics/gerbmerge/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -# ChangeLog for sci-electronics/gerbmerge -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 04 Sep 2011; Christopher Head (Hawk777) <headch@gmail.com> - -gerbmerge-1.6.ebuild: - Remove old v1.6. - - 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: - New Ebuild for bug 338875 - diff --git a/sci-electronics/gerbmerge/Manifest b/sci-electronics/gerbmerge/Manifest deleted file mode 100644 index 0ebc1e242..000000000 --- a/sci-electronics/gerbmerge/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -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.8.tar.gz 860155 RMD160 1429b4fbbebb40491cfb94690eaa0d6698ea619d SHA1 6f2a756dfc31bc6648e03e8a2c7dee01e3b17119 SHA256 ad1a4e5ae7b42ea543acc71151068e056312f57a8b13fa2e42cbf80f04ce8821 -EBUILD gerbmerge-1.8.ebuild 1402 RMD160 54fedd7457c90e02b6618fd999dd47ba5e157abc SHA1 ca77ae15ab8a1f8523254b285111f0d742c22eeb SHA256 372f2cef4851ec3af7aa1d487cf58d0e414250282711dec2ce134ffc41e7f802 -MISC ChangeLog 689 RMD160 33be9b8be9285e6818bb0c8460ffd17f1e6cc4fd SHA1 4c5b639e5bfe4d05bbf5fd6fd3ee8107d3a13741 SHA256 16604340a1064fd5d11eee3f0ec02dc8f6100f76103ea6468754332cbe077471 -MISC metadata.xml 446 RMD160 5e5ebbe2fc96e4ddcb3654734e6cd8a81bcc70cf SHA1 5561ba9a198dbad1af07fdbc53f6a92a163e0133 SHA256 937dda2a09d459682a6f87cc57c95288a19d41d2d60623123babd3c5940222ab diff --git a/sci-electronics/gerbmerge/files/gerbmerge-1.6-no-fixperms.patch b/sci-electronics/gerbmerge/files/gerbmerge-1.6-no-fixperms.patch deleted file mode 100644 index 84b19dc61..000000000 --- a/sci-electronics/gerbmerge/files/gerbmerge-1.6-no-fixperms.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -49,6 +49,7 @@ - python %s/site-packages/gerbmerge/gerbmerge.py $* - """ % DestLib) - fid.close() -+ os.chmod('misc/gerbmerge', 0755) - - dist=setup (name = "gerbmerge", - license = "GPL", -@@ -80,39 +81,11 @@ - (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 ******** ' diff --git a/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch b/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch deleted file mode 100644 index 6e51f61b1..000000000 --- a/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-main.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index ead8b7121..000000000 --- a/sci-electronics/gerbmerge/files/gerbmerge-1.8-fix-setup.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 deleted file mode 100644 index bfc5ce980..000000000 --- a/sci-electronics/gerbmerge/files/gerbmerge-1.8-launcher.py +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env python -import gerbmerge.gerbmerge -gerbmerge.gerbmerge.main() diff --git a/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild b/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild deleted file mode 100644 index 51e8e5bd8..000000000 --- a/sci-electronics/gerbmerge/gerbmerge-1.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 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 deleted file mode 100644 index 09068ef58..000000000 --- a/sci-electronics/gerbmerge/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>maintainer-wanted@gentoo.org</email> - </maintainer> - <longdescription>A program for combining (panelizing) Gerber/Excellon files</longdescription> - <upstream> - <maintainer> - <email>support@ruggedcircuits.com</email> - <name>Rugged Circuits LLC</name> - </maintainer> - </upstream> -</pkgmetadata> |