4 files changed, 1 insertions, 54 deletions
diff --git a/sci-visualization/fig2sxd/Manifest b/sci-visualization/fig2sxd/Manifest
index 44e0a3ac3ea0..428f8583cba2 100644
--- a/sci-visualization/fig2sxd/Manifest
+++ b/sci-visualization/fig2sxd/Manifest
@@ -1,3 +1 @@
-DIST fig2sxd_0.21-2.diff.gz 2765 SHA256 b9dd3c562b81ea820276a8b5c4c2e0049c5c201624e9b02b6fa1faf106f6b28c SHA512 7b09a837fd2f59e27869dab788b8fd75f810eadf31f54ec1c7e4445ecc13093e68bb22cfc0b8163d65ae6e661cf8ad414c03172fa10367d3c14e2b0332eb1d2f WHIRLPOOL 3d718300ea0b1a21f3e5bc126d272239ea67225930014cd0205371a82cfbf5af3356dfcf1dfd1e258642e733f4a15404883da86084226e7ab4a329a7f94ab0b8
-DIST fig2sxd_0.21.orig.tar.gz 26083 SHA256 11a47f458c1d63f1c80dd49d8bb9dfc008cdb5d4d5c9a8611c258da3fdb8150a SHA512 666975716c56cdc9e8660e81f086887edd5d7e78e3d50c528130b264eec377cae0ba2ac17467a351d46c402f9f736c7b166c0b3849abe6d0d1187c7270b99152 WHIRLPOOL ec3818ab59d485a5dbbcd9e4d90b7bfcbfba9cbfdea80ae3d759f50af4c3923e97c3e0b22a93d7211a31449678e0a7b099c463a9d6c2007f5543e3276eba5895
 DIST fig2sxd_0.22.1.orig.tar.gz 26474 SHA256 de6d740a64fde7bad0a65b3a63fe29bb7f647e28a643fc6c6740b6c197d55d73 SHA512 cc407f68e1d82f05566cce8d19bc3f64f4b39c338629b393d3c3d7770c6c69499943c247ddc9bebf1193bab6c4896d28c3b771ed29cfa751a0b6184847a0fc4a WHIRLPOOL 5276ef7a30e3f6886255723ec108b3b78ed5ca51ebe078698d3ee523ccb41b36ed861f4355f8765316f39e3aada3fa5018e9094fe3c496b383aea45456eccb06
diff --git a/sci-visualization/fig2sxd/fig2sxd-0.21.ebuild b/sci-visualization/fig2sxd/fig2sxd-0.21.ebuild
deleted file mode 100644
index de8db02186d7..000000000000
--- a/sci-visualization/fig2sxd/fig2sxd-0.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to convert files in xfig format to OpenOffice.org Draw format"
-LICENSE="GPL-2"
-PVD=2
-
-HOMEPAGE="https://sourceforge.net/projects/fig2sxd"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz
-	 mirror://sourceforge/${PN}/${PN}_${PV}-${PVD}.diff.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${PV}-${PVD}.diff
-	epatch "${FILESDIR}"/${PN}-0.20-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-0.20-phony-check.patch
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc changelog
-}
diff --git a/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild b/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
index f341f50a4906..5e2b451c924f 100644
--- a/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
+++ b/sci-visualization/fig2sxd/fig2sxd-0.22.1.ebuild
@@ -19,9 +19,8 @@ IUSE=""
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.20-phony-check.patch )
-
 DOCS=( changelog )
+PATCHES=( "${FILESDIR}"/${PN}-0.20-phony-check.patch )
 
 src_compile() {
 	emake CXXFLAGS="${CXXFLAGS}" CXX="$(tc-getCXX)"
diff --git a/sci-visualization/fig2sxd/files/fig2sxd-0.20-ldflags.patch b/sci-visualization/fig2sxd/files/fig2sxd-0.20-ldflags.patch
deleted file mode 100644
index a9bd521d3196..000000000000
--- a/sci-visualization/fig2sxd/files/fig2sxd-0.20-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur fig2sxd-0.20/Makefile fig2sxd-0.20.new/Makefile
---- fig2sxd-0.20/Makefile	2008-05-16 18:47:34.000000000 -0400
-+++ fig2sxd-0.20.new/Makefile	2009-08-31 22:14:38.000000000 -0400
-@@ -51,7 +51,7 @@
- LIBS = -lz
- 
- $(TARGET1): $(OBJECTS1)
--	$(CXX) -o $@ $^ $(LIBS)
-+	$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@ 
- 
- $(OBJECTS1): %.o: $(SRCDIR)%.cpp $(DEPEND)%.dep
- 	$(CXX) $(CXXFLAGS) -o $@ -c $<