Convert make to emake, add x11-libs/libXi dependency, thanks to Patrick Lauer for reporting, bug 153069

Package-Manager: portage-2.1.2_rc2-r2

7 files changed, 47 insertions, 36 deletions

diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog
index 248a43cf1f98..dc58294469a9 100644
--- a/media-gfx/xfig/ChangeLog
+++ b/media-gfx/xfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xfig
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.27 2006/08/02 21:37:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.28 2006/12/02 00:30:11 masterdriverz Exp $
+
+  02 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
+  xfig-3.2.4-r1.ebuild, xfig-3.2.4-r2.ebuild, xfig-3.2.5_alpha5.ebuild:
+  Convert make to emake, add x11-libs/libXi dependency, thanks to Patrick
+  Lauer for reporting, bug 153069
 
   02 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> xfig-3.2.4-r2.ebuild:
   Stable on sparc
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 1778dcaa4601..873ce17ba02c 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -14,26 +14,26 @@ AUX xfig-3.2.5_alpha5-xaw3d.diff 456 RMD160 1e3e8808e4d5b3b585b90af9759219f1ab82
 MD5 65da21fda4fd5353fa3d7f421982af99 files/xfig-3.2.5_alpha5-xaw3d.diff 456
 RMD160 1e3e8808e4d5b3b585b90af9759219f1ab8235e1 files/xfig-3.2.5_alpha5-xaw3d.diff 456
 SHA256 ed32ad21d6640871a4f4858facade73c83a1eb39a2c893124d54ba1ab0d941a6 files/xfig-3.2.5_alpha5-xaw3d.diff 456
-DIST shape-patch.3.2.4-shape-1.1.tar.gz 49201
+DIST shape-patch.3.2.4-shape-1.1.tar.gz 49201 RMD160 0d8738fd8b3d04e334580355a5a8c312f6b957d2 SHA1 420e1592d5ab3aa13bbe0830e9da4cfe23f277ae SHA256 150dfc36ae2448f998b55eb8145d50d1d4efeaf952d8c6341ed98afef9cd82f0
 DIST xfig-3.2.4-gentoo.diff.bz2 1001 RMD160 2f54a944be8039e4d51b1109acf70e41d67abf3d SHA1 85b59c6f7efc65ef87f012f161768dfdb75c4f59 SHA256 5197554a9778e8ef2ede5d1dee5629ca56c8a36e5d8bd3f195f2a4506243f659
 DIST xfig.3.2.4.full.tar.gz 5163150 RMD160 3cae7c8d3f2a89ef54fd4a4693e84fa7a9bacf44 SHA1 723bf10355a92c079be08cd7be18b75baaccfbdc SHA256 11612391c49ae9b17692c1775e3479e5c67dd788e31436b7197ea46d610d2d84
-DIST xfig.3.2.5-alpha5.full.tar.gz 5836544
-EBUILD xfig-3.2.4-r1.ebuild 1221 RMD160 12b2c156cd87f9cc46577a387e7bfa9c6ec5cabc SHA1 1151d40c1cbe503c4a46f56d8b7dcb01bf5535be SHA256 710220aaf5db9c459f7ddefbf3e2da97afb6a649022588588fc14eeaf51590d3
-MD5 3fab77205b21ef9b26caa586a7930686 xfig-3.2.4-r1.ebuild 1221
-RMD160 12b2c156cd87f9cc46577a387e7bfa9c6ec5cabc xfig-3.2.4-r1.ebuild 1221
-SHA256 710220aaf5db9c459f7ddefbf3e2da97afb6a649022588588fc14eeaf51590d3 xfig-3.2.4-r1.ebuild 1221
-EBUILD xfig-3.2.4-r2.ebuild 1596 RMD160 bc681f61742171b4764e96c94247e55296a5b374 SHA1 7ddc5ef02a39a2e78e9232487d0462395a5c40b2 SHA256 d10f16c38204cf2af86b0d4585bcdd425b837ea040e53a9ef7eb167c12537178
-MD5 a52f86198708c9f4a46761ce351f73e6 xfig-3.2.4-r2.ebuild 1596
-RMD160 bc681f61742171b4764e96c94247e55296a5b374 xfig-3.2.4-r2.ebuild 1596
-SHA256 d10f16c38204cf2af86b0d4585bcdd425b837ea040e53a9ef7eb167c12537178 xfig-3.2.4-r2.ebuild 1596
-EBUILD xfig-3.2.5_alpha5.ebuild 1357 RMD160 b6755d767888d77ccb0e6d438684cf96ac2419aa SHA1 b2461591d2daeef7bcd6b1d84b4ca7afdcdee320 SHA256 1bea234c9ab2afef12ea1016f9bc5aa5c14bf9c7b3e98b2111d651794a010952
-MD5 d11ea5bd0a4a96604ff0a620e51745ef xfig-3.2.5_alpha5.ebuild 1357
-RMD160 b6755d767888d77ccb0e6d438684cf96ac2419aa xfig-3.2.5_alpha5.ebuild 1357
-SHA256 1bea234c9ab2afef12ea1016f9bc5aa5c14bf9c7b3e98b2111d651794a010952 xfig-3.2.5_alpha5.ebuild 1357
-MISC ChangeLog 3974 RMD160 db40c246148f8c5bd008503ddef469054f0d83f6 SHA1 b81578ef9e9ee407cb71f3b99e0c73632a3c75de SHA256 3ec3ba4a0d23660a0fc62ca9a912be1ee496d3df154d68481c1c1b60482aeab4
-MD5 41c7d030791bc4f1edbeba4ada224d8e ChangeLog 3974
-RMD160 db40c246148f8c5bd008503ddef469054f0d83f6 ChangeLog 3974
-SHA256 3ec3ba4a0d23660a0fc62ca9a912be1ee496d3df154d68481c1c1b60482aeab4 ChangeLog 3974
+DIST xfig.3.2.5-alpha5.full.tar.gz 5836544 RMD160 47fd9d74b117518d1870297228e31591f312df2d SHA1 ed99caf4505bc401ac34ecbe3d4c0aa783c4cc62 SHA256 12491dc550939887d074d64496d105d41b41f69d2c719324a9e44b1c4f4815d9
+EBUILD xfig-3.2.4-r1.ebuild 1224 RMD160 5f1f84669be51b61b57943b6a99007fe907b2b91 SHA1 f531a562b8000898cde453087692d14e949caed3 SHA256 f245b8075c1fb81a11f8e8fa53112190cd603de01f08cfd4e30275976833fc40
+MD5 cbc5adebbcbea79c43048fda92c271c2 xfig-3.2.4-r1.ebuild 1224
+RMD160 5f1f84669be51b61b57943b6a99007fe907b2b91 xfig-3.2.4-r1.ebuild 1224
+SHA256 f245b8075c1fb81a11f8e8fa53112190cd603de01f08cfd4e30275976833fc40 xfig-3.2.4-r1.ebuild 1224
+EBUILD xfig-3.2.4-r2.ebuild 1621 RMD160 c8f5307b0145df1863e24669696e01d568be5069 SHA1 ec45bf397848f01d48a8cbea51310bcc0aa62fce SHA256 bf75f522aed67b8235178250bcc176f45a439b3331a68893f12c333211ad923b
+MD5 8ad9d1d67009ebef2effe9fae4098f04 xfig-3.2.4-r2.ebuild 1621
+RMD160 c8f5307b0145df1863e24669696e01d568be5069 xfig-3.2.4-r2.ebuild 1621
+SHA256 bf75f522aed67b8235178250bcc176f45a439b3331a68893f12c333211ad923b xfig-3.2.4-r2.ebuild 1621
+EBUILD xfig-3.2.5_alpha5.ebuild 1376 RMD160 e25d6ca44eef206bb79dcfa37a3bc2c2323746f5 SHA1 5ca082fab9d3acefe5d8454ff4c5a710a47aec23 SHA256 9ead71e8e4d5353487b95dfe09ef43ef0e2930e0479800b14b33d86000950f9b
+MD5 002afd3dfa521dce73a19fb09055c45e xfig-3.2.5_alpha5.ebuild 1376
+RMD160 e25d6ca44eef206bb79dcfa37a3bc2c2323746f5 xfig-3.2.5_alpha5.ebuild 1376
+SHA256 9ead71e8e4d5353487b95dfe09ef43ef0e2930e0479800b14b33d86000950f9b xfig-3.2.5_alpha5.ebuild 1376
+MISC ChangeLog 4219 RMD160 1f658732ab11f1fda7ce3341ee1f3d1c46565c02 SHA1 2042d4163aff833e3ca670c30074236e3f5bf39a SHA256 a595b3ee832c2a4020d18012a22c5409bdc130c000bd97c92fba300fb3a46c8c
+MD5 bcaba5ce111615bf42789aec71716123 ChangeLog 4219
+RMD160 1f658732ab11f1fda7ce3341ee1f3d1c46565c02 ChangeLog 4219
+SHA256 a595b3ee832c2a4020d18012a22c5409bdc130c000bd97c92fba300fb3a46c8c ChangeLog 4219
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
@@ -41,9 +41,9 @@ SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata
 MD5 4652aecc20f8efec841e0e0c016edff0 files/digest-xfig-3.2.4-r1 503
 RMD160 8a90a20c25c1e52a3baf45f69d9a42f47191bbf5 files/digest-xfig-3.2.4-r1 503
 SHA256 b9df696f347cddbbdb3192164105810d521b0cf44569af12a11ba5dd51ea8ff2 files/digest-xfig-3.2.4-r1 503
-MD5 4d07153c0e131ec6680df353fe8da5c6 files/digest-xfig-3.2.4-r2 581
-RMD160 2b75ac5417352840e747ecca76d763a02359cf2c files/digest-xfig-3.2.4-r2 581
-SHA256 0b82215ec01ffcc0084d03e2eb5d2b4283623daa84015c6f8ce1b43119b73bd8 files/digest-xfig-3.2.4-r2 581
-MD5 b30d1a2b0c6ce802248a2605e13356df files/digest-xfig-3.2.5_alpha5 75
-RMD160 8dd1a1b2aea97ba5c5f8c3a0b67f7aed7bab95ea files/digest-xfig-3.2.5_alpha5 75
-SHA256 a43799ae58415ae8e855c438679bffccf6408fd5f105239a9182c302a7140b01 files/digest-xfig-3.2.5_alpha5 75
+MD5 4b55feb9c84ddde92ee4448f79ac3ac5 files/digest-xfig-3.2.4-r2 783
+RMD160 95bb762749b668a1ce3c93c630b1f3be673882c3 files/digest-xfig-3.2.4-r2 783
+SHA256 6ff302d933b263ce4c0e0f52dee1c2d5bbd8f0ca1207281f18615faa42c2cc0f files/digest-xfig-3.2.4-r2 783
+MD5 54395a5b073276bd8e276e0290949075 files/digest-xfig-3.2.5_alpha5 271
+RMD160 c162099f691b46aad87ee25e03e46686c976a620 files/digest-xfig-3.2.5_alpha5 271
+SHA256 b07c62391f97d3e7265c138dd6e5d886325a576f7b48d82200fe4d29a3c9ee68 files/digest-xfig-3.2.5_alpha5 271
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.4-r2 b/media-gfx/xfig/files/digest-xfig-3.2.4-r2
index 023da7866db0..4082a12ca609 100644
--- a/media-gfx/xfig/files/digest-xfig-3.2.4-r2
+++ b/media-gfx/xfig/files/digest-xfig-3.2.4-r2
@@ -1,4 +1,6 @@
 MD5 50c20eb5cae5268352cfe996e32b8f3c shape-patch.3.2.4-shape-1.1.tar.gz 49201
+RMD160 0d8738fd8b3d04e334580355a5a8c312f6b957d2 shape-patch.3.2.4-shape-1.1.tar.gz 49201
+SHA256 150dfc36ae2448f998b55eb8145d50d1d4efeaf952d8c6341ed98afef9cd82f0 shape-patch.3.2.4-shape-1.1.tar.gz 49201
 MD5 fbc5f9f480651bcfb189e95a642f3fe0 xfig-3.2.4-gentoo.diff.bz2 1001
 RMD160 2f54a944be8039e4d51b1109acf70e41d67abf3d xfig-3.2.4-gentoo.diff.bz2 1001
 SHA256 5197554a9778e8ef2ede5d1dee5629ca56c8a36e5d8bd3f195f2a4506243f659 xfig-3.2.4-gentoo.diff.bz2 1001
diff --git a/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5 b/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5
index 9e7ffed83c7f..29f80addbc51 100644
--- a/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5
+++ b/media-gfx/xfig/files/digest-xfig-3.2.5_alpha5
@@ -1 +1,3 @@
 MD5 7547b66232569e3c12e4a0639bd92629 xfig.3.2.5-alpha5.full.tar.gz 5836544
+RMD160 47fd9d74b117518d1870297228e31591f312df2d xfig.3.2.5-alpha5.full.tar.gz 5836544
+SHA256 12491dc550939887d074d64496d105d41b41f69d2c719324a9e44b1c4f4815d9 xfig.3.2.5-alpha5.full.tar.gz 5836544
diff --git a/media-gfx/xfig/xfig-3.2.4-r1.ebuild b/media-gfx/xfig/xfig-3.2.4-r1.ebuild
index f70236d56acb..73b629140f94 100644
--- a/media-gfx/xfig/xfig-3.2.4-r1.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.11 2006/02/11 16:36:56 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r1.ebuild,v 1.12 2006/12/02 00:30:11 masterdriverz Exp $
 
 inherit eutils
 
@@ -40,13 +40,13 @@ src_unpack() {
 
 src_compile() {
 	xmkmf || die
-	make || die
+	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR=${D} install || die
 
-	make \
+	emake \
 		DESTDIR=${D} \
 		MANDIR=/usr/share/man/man1 \
 		MANSUFFIX=1 \
diff --git a/media-gfx/xfig/xfig-3.2.4-r2.ebuild b/media-gfx/xfig/xfig-3.2.4-r2.ebuild
index 7ef77fec9b0a..c835efc0a8fb 100644
--- a/media-gfx/xfig/xfig-3.2.4-r2.ebuild
+++ b/media-gfx/xfig/xfig-3.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.11 2006/08/02 21:37:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.4-r2.ebuild,v 1.12 2006/12/02 00:30:11 masterdriverz Exp $
 
 inherit eutils multilib
 
@@ -31,7 +31,8 @@ DEPEND="${RDEPEND}
 	|| ( ( x11-misc/imake
 			app-text/rman
 			x11-proto/xproto
-			x11-proto/inputproto )
+			x11-proto/inputproto
+			x11-libs/libXi )
 		virtual/x11 )"
 
 src_unpack() {
@@ -45,12 +46,12 @@ src_unpack() {
 
 src_compile() {
 	xmkmf || die
-	make BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die
+	emake BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die
 }
 
 src_install() {
 
-	make \
+	emake \
 		DESTDIR=${D} \
 		BINDIR=/usr/bin \
 		XFIGLIBDIR=/usr/$(get_libdir)/xfig \
diff --git a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
index 755a10109663..f15998cc3500 100644
--- a/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
+++ b/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.2 2006/02/11 16:36:56 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/xfig-3.2.5_alpha5.ebuild,v 1.3 2006/12/02 00:30:11 masterdriverz Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ DEPEND="${RDEPEND}
 	|| ( ( x11-misc/imake
 			app-text/rman
 			x11-proto/xproto
-			x11-proto/inputproto )
+			x11-proto/inputproto
+			x11-libs/libXi )
 		virtual/x11 )"
 
 src_unpack() {
@@ -45,7 +46,7 @@ src_compile() {
 
 src_install() {
 
-	make \
+	emake \
 		DESTDIR="${D}" \
 		BINDIR=/usr/bin \
 		XFIGLIBDIR=/usr/lib/xfig \