Cleanup.

(Portage version: 2.1.10.47/cvs/Linux x86_64)

4 files changed, 6 insertions, 268 deletions

diff --git a/sci-electronics/pcb/ChangeLog b/sci-electronics/pcb/ChangeLog
index c0d73f45badb..e9ac7ed54fb4 100644
--- a/sci-electronics/pcb/ChangeLog
+++ b/sci-electronics/pcb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/pcb
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.64 2011/06/28 19:56:04 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/ChangeLog,v 1.65 2012/02/19 04:56:01 calchan Exp $
+
+  19 Feb 2012; Denis Dupeyron <calchan@gentoo.org> -pcb-20081128-r1.ebuild,
+  -pcb-20091103.ebuild, -files/pcb-20091103-png.patch:
+  Cleanup.
 
   28 Jun 2011; Brent Baude <ranger@gentoo.org> pcb-20100929.ebuild:
   Marking pcb-20100929 ppc for bug 349096
diff --git a/sci-electronics/pcb/files/pcb-20091103-png.patch b/sci-electronics/pcb/files/pcb-20091103-png.patch
deleted file mode 100644
index aad951d7b00b..000000000000
--- a/sci-electronics/pcb/files/pcb-20091103-png.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hid/png/png.c.orig	2010-07-19 15:36:17.000000000 +0200
-+++ src/hid/png/png.c	2010-07-19 15:37:53.000000000 +0200
-@@ -137,6 +137,8 @@
-   NULL
- };
- 
-+#define NUM_FILETYPES (sizeof(filetypes)/sizeof(filetypes[0]) - 1)
-+
- HID_Attribute png_attribute_list[] = {
-   /* other HIDs expect this to be first.  */
-   {"outfile", "Graphics output file",
-@@ -176,7 +178,7 @@
- #define HA_use_alpha 8
- 
-   {"format", "Graphics file format",
--   HID_Enum, 0, 0, {2, 0, 0}, filetypes, 0},
-+   HID_Enum, 0, 0, {NUM_FILETYPES-1, 0, 0}, filetypes, 0},
- #define HA_filetype 9
- 
-   {"png-bloat", "Amount (in/mm/mil/pix) to add to trace/pad/pin edges (1 = 1/100 mil)",
diff --git a/sci-electronics/pcb/pcb-20081128-r1.ebuild b/sci-electronics/pcb/pcb-20081128-r1.ebuild
deleted file mode 100644
index 878a8ffb5ea7..000000000000
--- a/sci-electronics/pcb/pcb-20081128-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20081128-r1.ebuild,v 1.8 2011/03/06 09:27:50 jlec Exp $
-
-EAPI="2"
-
-inherit fdo-mime
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://www.gpleda.org/"
-SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus doc gif gtk jpeg motif nelma nls png xrender threads tk"
-
-RDEPEND="gif? ( >=media-libs/gd-2.0.23 )
-	gtk? ( x11-libs/gtk+:2 x11-libs/pango
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( >=media-libs/gd-2.0.23[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/openmotif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( >=media-libs/gd-2.0.23 )
-	nls? ( virtual/libintl )
-	png? ( >=media-libs/gd-2.0.23[png] )
-	tk? ( >=dev-lang/tk-8 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	# src/hid/batch/hid.conf is missing in the 20081128 snapshot
-	cp src/hid/gtk/hid.conf src/hid/batch/
-
-	sed -i -e 's/example//' -e 's/tutorial//' -e 's/ win32//' Makefile.in || die "sed failed"
-	sed -i -e 's/DOC=doc/DOC="doc example tutorial"/' configure || die "sed failed"
-	sed -i -e 's/$(pkgdatadir)/$(docdir)/' {example,tutorial}/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-
-	use tk || export WISH="/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable threads threads posix) \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS ChangeLog
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-electronics/pcb/pcb-20091103.ebuild b/sci-electronics/pcb/pcb-20091103.ebuild
deleted file mode 100644
index de9f20c6ecf8..000000000000
--- a/sci-electronics/pcb/pcb-20091103.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/pcb/pcb-20091103.ebuild,v 1.7 2011/03/06 09:27:50 jlec Exp $
-
-EAPI="2"
-
-inherit fdo-mime gnome2-utils eutils
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://www.gpleda.org/"
-SRC_URI="mirror://sourceforge/pcb/files/pcb/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
-IUSE="dbus doc gif gtk jpeg m4lib-png motif nelma nls png xrender test tk toporouter"
-# toporouter-output USE flag removed for pcb-20091103 (output was disabled always)
-# debug USE flag removed for pcb-20091103 (many crashes, should be fixed for next release)
-
-CDEPEND="gif? ( >=media-libs/gd-2.0.23 )
-	gtk? ( x11-libs/gtk+:2 x11-libs/pango
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( >=media-libs/gd-2.0.23[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/openmotif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( >=media-libs/gd-2.0.23 )
-	nls? ( virtual/libintl )
-	png? ( >=media-libs/gd-2.0.23[png] )
-	m4lib-png? ( >=media-libs/gd-2.0.23[png] )
-	tk? ( >=dev-lang/tk-8 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
-		sci-electronics/gerbv
-	)
-	>=dev-util/intltool-0.35
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	# fix bug in pcb-20091103, see http://archives.seul.org/geda/user/Nov-2009/msg00577.html
-	if use m4lib-png; then
-		rm -f lib/pcblib-newlib.stamp
-	fi
-	if ! use png; then
-		sed -i '/^hid_png1/d' tests/tests.list || die
-	fi
-	sed -i -e 's/example//' -e 's/tutorial//' -e 's/ win32//' Makefile.in || die "sed failed"
-	sed -i -e 's/DOC=doc/DOC="doc example tutorial"/' configure || die "sed failed"
-	sed -i -e 's/$(pkgdatadir)/$(docdir)/' {example,tutorial}/Makefile.in || die "sed failed"
-
-	# fix bug in pcb-20091103, should be fixed in next release
-	sed -i -e 's/free (&pd);/free (pd);/' src/hid/lesstif/main.c || die "sed failed"
-
-	# fix segfault during 'pcb -h' if USE=-gif or -jpeg or -png
-	epatch "${FILESDIR}"/${P}-png.patch
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-
-	use tk || export WISH="/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="/usr/share/doc/${PF}"
-}
-# Removed for pcb-20091103 (should be fixed for next release):
-#		$(use_enable debug)
-#		$(use_enable toporouter-output) \
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README NEWS ChangeLog
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}