From 4dd00477c7aa6bfdbbc97fa6348119a98e599ea8 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 2 Apr 2007 15:23:03 +0000 Subject: [PATCH] Fixed commit strait into stable. Some other modifications mentioned in bug #173009. Package-Manager: portage-2.1.2.2 --- media-gfx/xfig/ChangeLog | 9 ++- media-gfx/xfig/Manifest | 30 +++---- ...digest-xfig-3.2.5 => digest-xfig-3.2.5-r1} | 0 media-gfx/xfig/metadata.xml | 4 +- media-gfx/xfig/xfig-3.2.5-r1.ebuild | 78 +++++++++++++++++++ media-gfx/xfig/xfig-3.2.5.ebuild | 52 ------------- 6 files changed, 103 insertions(+), 70 deletions(-) rename media-gfx/xfig/files/{digest-xfig-3.2.5 => digest-xfig-3.2.5-r1} (100%) create mode 100644 media-gfx/xfig/xfig-3.2.5-r1.ebuild delete mode 100644 media-gfx/xfig/xfig-3.2.5.ebuild diff --git a/media-gfx/xfig/ChangeLog b/media-gfx/xfig/ChangeLog index 73c4bf79eabf..e252749b0e25 100644 --- a/media-gfx/xfig/ChangeLog +++ b/media-gfx/xfig/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/xfig # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.39 2007/04/01 18:58:26 anant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xfig/ChangeLog,v 1.40 2007/04/02 15:23:03 pva Exp $ + +*xfig-3.2.5-r1 (02 Apr 2007) + + 02 Apr 2007; metadata.xml, -xfig-3.2.5.ebuild, + +xfig-3.2.5-r1.ebuild: + Fixed commit strait into stable. Some other modifications mentioned in bug + #173009. 01 Apr 2007; Anant Narayanan xfig-3.2.5.ebuild: Fix SRC_URI, closes bug #173009 diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest index 3532a492f7d0..9e9a24187c44 100644 --- a/media-gfx/xfig/Manifest +++ b/media-gfx/xfig/Manifest @@ -27,31 +27,31 @@ EBUILD xfig-3.2.4-r3.ebuild 1610 RMD160 b092f1360c3279cb7b7a788f566729964920edc3 MD5 a992a0fc0e0396835f9f1c045e05223e xfig-3.2.4-r3.ebuild 1610 RMD160 b092f1360c3279cb7b7a788f566729964920edc3 xfig-3.2.4-r3.ebuild 1610 SHA256 774d9a1805b9ec1d5e02e2eb5144a08d956cfbcc3742eff5f42a369c7b3e5089 xfig-3.2.4-r3.ebuild 1610 -EBUILD xfig-3.2.5.ebuild 1215 RMD160 5670023b390951c6db31b296fa5afc4c3083a2b6 SHA1 d8ecbe16f16c66965fc5f186ba3b6afa5309e629 SHA256 f3891315967d12a802312f6f540c6db75cbe563c07e3994f48f625e8918dfa10 -MD5 928b4e2232d6609f2476ea75883e93af xfig-3.2.5.ebuild 1215 -RMD160 5670023b390951c6db31b296fa5afc4c3083a2b6 xfig-3.2.5.ebuild 1215 -SHA256 f3891315967d12a802312f6f540c6db75cbe563c07e3994f48f625e8918dfa10 xfig-3.2.5.ebuild 1215 +EBUILD xfig-3.2.5-r1.ebuild 1883 RMD160 59cf621dd2bf2f81a0792a8b82300f90b8cd6c6f SHA1 11ab5c3454108cb03cf8ce98c8c6169daf5ebb50 SHA256 3b639eec89fc7b4b94de1bade4ef89ccbd8811e23f84b89150ca52db677f0a91 +MD5 421f0c227253faf618d09de5db92b650 xfig-3.2.5-r1.ebuild 1883 +RMD160 59cf621dd2bf2f81a0792a8b82300f90b8cd6c6f xfig-3.2.5-r1.ebuild 1883 +SHA256 3b639eec89fc7b4b94de1bade4ef89ccbd8811e23f84b89150ca52db677f0a91 xfig-3.2.5-r1.ebuild 1883 EBUILD xfig-3.2.5_alpha5.ebuild 1374 RMD160 1787473509ad4e09d78c2d45fad756de33156796 SHA1 2b48dee022c2bde6923db1952baf0b350d60d70f SHA256 b4fe0af557050a2aa8f7e0cde770521902457660edf416d468e6a71c512a5773 MD5 74d957b28fde2f9133352c4c70ae60c0 xfig-3.2.5_alpha5.ebuild 1374 RMD160 1787473509ad4e09d78c2d45fad756de33156796 xfig-3.2.5_alpha5.ebuild 1374 SHA256 b4fe0af557050a2aa8f7e0cde770521902457660edf416d468e6a71c512a5773 xfig-3.2.5_alpha5.ebuild 1374 -MISC ChangeLog 5400 RMD160 863f4a80c80c97b542fa39465f6992bcc03b8b80 SHA1 3b43ccb06dbe43bfc83e90e208ec497b8164c323 SHA256 6c57795fe0dbacfa0d0547f93b0846b61c0614b51e7b6dfe9db3acdfcc9f9b5e -MD5 596b56cd1577ff4eb213e0afffdfc96e ChangeLog 5400 -RMD160 863f4a80c80c97b542fa39465f6992bcc03b8b80 ChangeLog 5400 -SHA256 6c57795fe0dbacfa0d0547f93b0846b61c0614b51e7b6dfe9db3acdfcc9f9b5e ChangeLog 5400 -MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 -MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314 -RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314 -SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata.xml 314 +MISC ChangeLog 5608 RMD160 70fccf0a6c500d77f9ce8e3e0b428c2c0a412ace SHA1 2f83ed1a876853d41cdfda0f9dd6e803a1d3540c SHA256 c7b49f99be2a3e080450ce7fda130a14be370b5d6ff613903cfefdca808b3e64 +MD5 baae788eb5b3381574e5f9f6f4764a8a ChangeLog 5608 +RMD160 70fccf0a6c500d77f9ce8e3e0b428c2c0a412ace ChangeLog 5608 +SHA256 c7b49f99be2a3e080450ce7fda130a14be370b5d6ff613903cfefdca808b3e64 ChangeLog 5608 +MISC metadata.xml 250 RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae SHA1 c4991bbfca89085d81f56ed53f8b0c827a35a4f1 SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d +MD5 0698e8ff7687c28bc42862b4a486f1f5 metadata.xml 250 +RMD160 f27bc8272125f15d03c2bfc87e961842bdb303ae metadata.xml 250 +SHA256 68999dde540491efec63a8f47366dbc2d5f2c9f2c1211709d92366a56b6cd27d metadata.xml 250 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 4b55feb9c84ddde92ee4448f79ac3ac5 files/digest-xfig-3.2.4-r3 783 RMD160 95bb762749b668a1ce3c93c630b1f3be673882c3 files/digest-xfig-3.2.4-r3 783 SHA256 6ff302d933b263ce4c0e0f52dee1c2d5bbd8f0ca1207281f18615faa42c2cc0f files/digest-xfig-3.2.4-r3 783 -MD5 28bf7779bf4cb5c359b4eedeff065919 files/digest-xfig-3.2.5 250 -RMD160 5160a4b5473c2d2d87c86a93ddd277c50ecca7d3 files/digest-xfig-3.2.5 250 -SHA256 97f253066a9fbe97f039f8d81e9aeb4dce528f07a941d95e08d58e0424b77fbc files/digest-xfig-3.2.5 250 +MD5 28bf7779bf4cb5c359b4eedeff065919 files/digest-xfig-3.2.5-r1 250 +RMD160 5160a4b5473c2d2d87c86a93ddd277c50ecca7d3 files/digest-xfig-3.2.5-r1 250 +SHA256 97f253066a9fbe97f039f8d81e9aeb4dce528f07a941d95e08d58e0424b77fbc files/digest-xfig-3.2.5-r1 250 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.5 b/media-gfx/xfig/files/digest-xfig-3.2.5-r1 similarity index 100% rename from media-gfx/xfig/files/digest-xfig-3.2.5 rename to media-gfx/xfig/files/digest-xfig-3.2.5-r1 diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml index b17012b02b48..fe8a273e1e15 100644 --- a/media-gfx/xfig/metadata.xml +++ b/media-gfx/xfig/metadata.xml @@ -3,7 +3,7 @@ no-herd - maintainer-needed@gentoo.org - This package lacks a primary herd or maintainer. + pva@gentoo.org + Peter Volkov diff --git a/media-gfx/xfig/xfig-3.2.5-r1.ebuild b/media-gfx/xfig/xfig-3.2.5-r1.ebuild new file mode 100644 index 000000000000..9ef8be9ee6f5 --- /dev/null +++ b/media-gfx/xfig/xfig-3.2.5-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/04/02 15:23:03 pva Exp $ + +inherit eutils multilib + +MY_P=${PN}.${PV} +DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window." +HOMEPAGE="http://www.xfig.org" +SRC_URI="http://www.xfig.org/software/xfig/3.2.5/${MY_P}.full.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND="|| ( ( x11-libs/libXaw + x11-libs/libXp ) + virtual/x11 ) + x11-libs/Xaw3d + media-libs/jpeg + media-libs/libpng + >=media-gfx/transfig-3.2.5 + media-libs/netpbm" +DEPEND="${RDEPEND} + || ( ( x11-misc/imake + app-text/rman + x11-proto/xproto + x11-proto/inputproto + x11-libs/libXi ) + virtual/x11 )" + +S="${WORKDIR}"/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + + # We do not have nescape. Let's use firefox instead... + sed -i "s+netscape+firefox+g" Fig.ad +} + +sed_Imakefile() { + # see Imakefile for details + vars2subs="BINDIR=/usr/bin + PNGINC=-I/usr/include + JPEGLIBDIR=/usr/$(get_libdir) + JPEGINC=-I/usr/include + XPMLIBDIR=/usr/$(get_libdir) + XPMINC=-I/usr/include/X11 + USEINLINE=-DUSE_INLINE + XFIGLIBDIR=/usr/$(get_libdir)/xfig + XFIGDOCDIR=/usr/share/doc/${P} + MANDIR=/usr/share/man/man\$\(MANSUFFIX\) + CC=$(tc-getCC)" + + for variable in ${vars2subs} ; do + varname=${variable%%=*} + varval=${variable##*=} + sed -i "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" "$@" + done +} + + +src_compile() { + sed_Imakefile Imakefile + + xmkmf || die + emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ + USRLIBDIR=/usr/$(get_libdir) || die +} + +src_install() { + emake -j1 DESTDIR="${D}" install.all || die + + insinto /usr/share/doc/${P} + doins README FIGAPPS CHANGES LATEX.AND.XFIG +} diff --git a/media-gfx/xfig/xfig-3.2.5.ebuild b/media-gfx/xfig/xfig-3.2.5.ebuild deleted file mode 100644 index 7aaf24e7bfdf..000000000000 --- a/media-gfx/xfig/xfig-3.2.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2007 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.ebuild,v 1.2 2007/04/01 18:58:26 anant Exp $ - -inherit eutils multilib - -MY_P=${PN}.${PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window." -HOMEPAGE="http://www.xfig.org" -SRC_URI="http://www.xfig.org/software/xfig/3.2.5/${MY_P}.full.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="|| ( ( x11-libs/libXaw - x11-libs/libXp ) - virtual/x11 ) - x11-libs/Xaw3d - media-libs/jpeg - media-libs/libpng - media-gfx/transfig - media-libs/netpbm" -DEPEND="${RDEPEND} - || ( ( x11-misc/imake - app-text/rman - x11-proto/xproto - x11-proto/inputproto - x11-libs/libXi ) - virtual/x11 )" - -src_compile() { - xmkmf || die - emake BINDIR=/usr/bin XFIGLIBDIR=/usr/$(get_libdir)/xfig || die -} - -src_install() { - - emake -j1 \ - DESTDIR=${D} \ - BINDIR=/usr/bin \ - XFIGLIBDIR=/usr/$(get_libdir)/xfig \ - MANDIR=/usr/share/man/man1 \ - MANSUFFIX=1 \ - install install.all || die - - insinto /usr/share/doc/${P} - doins README FIGAPPS CHANGES LATEX.AND.XFIG -} -- 2.26.2