diff options
author | Andrey Grozin <grozin@gentoo.org> | 2009-01-03 06:32:35 +0000 |
---|---|---|
committer | Andrey Grozin <grozin@gentoo.org> | 2009-01-03 06:32:35 +0000 |
commit | a53dcf98b2625ac9d433eec9d646a97471645930 (patch) | |
tree | cde3a587f39981f2bb9874465142dab21a8517ec /app-office/texmacs | |
parent | Automated update of use.local.desc (diff) | |
download | historical-a53dcf98b2625ac9d433eec9d646a97471645930.tar.gz historical-a53dcf98b2625ac9d433eec9d646a97471645930.tar.bz2 historical-a53dcf98b2625ac9d433eec9d646a97471645930.zip |
Fixing dependencies, cleanup
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-tuxonice i686
Diffstat (limited to 'app-office/texmacs')
-rw-r--r-- | app-office/texmacs/ChangeLog | 8 | ||||
-rw-r--r-- | app-office/texmacs/Manifest | 10 | ||||
-rw-r--r-- | app-office/texmacs/files/texmacs-1.0.7-autotroll.patch | 10 | ||||
-rw-r--r-- | app-office/texmacs/files/texmacs-1.0.7-strip.patch | 11 | ||||
-rw-r--r-- | app-office/texmacs/files/texmacs-1.0.7.1-strip.patch | 11 | ||||
-rw-r--r-- | app-office/texmacs/texmacs-1.0.7.1.ebuild | 17 | ||||
-rw-r--r-- | app-office/texmacs/texmacs-1.0.7.ebuild | 70 |
7 files changed, 24 insertions, 113 deletions
diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog index af91e7416547..788dc6d95007 100644 --- a/app-office/texmacs/ChangeLog +++ b/app-office/texmacs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/texmacs # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.68 2009/01/02 18:48:31 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.69 2009/01/03 06:32:35 grozin Exp $ + + 03 Jan 2009; Andrey Grozin <grozin@gentoo.org> + files/texmacs-1.0.7.1-strip.patch, -files/texmacs-1.0.7-autotroll.patch, + -files/texmacs-1.0.7-strip.patch, -texmacs-1.0.7.ebuild, + texmacs-1.0.7.1.ebuild: + Fixing dependencies, cleanup *texmacs-1.0.7.1 (03 Jan 2009) diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest index 56d9a7855a42..25cec027778f 100644 --- a/app-office/texmacs/Manifest +++ b/app-office/texmacs/Manifest @@ -1,17 +1,13 @@ AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825 AUX texmacs-1.0.6.14.patch 4119 RMD160 c22e021dd215e7d450054d4c64b891faff0202b2 SHA1 66b0232e93e9b4697ce73cbcc10b8a8cba88ce0b SHA256 271c02834b01e0516834710267808373b2533bfd79f600c1421cfe38bae61ef3 AUX texmacs-1.0.6.15.patch 4119 RMD160 eaf4e5fc525f766c6713c23311c520a02f3d78da SHA1 c84e9611ad45d3547976fd150a9e86f30523385a SHA256 0c1dde310ce67cdb401b57ace68e757d6ce0b7b3432b806f79359f4d7d3d68ca -AUX texmacs-1.0.7-autotroll.patch 494 RMD160 a7eb8b258d075de65c4071952f8957845d0e2a85 SHA1 f1c9d2952f053ab10784e46c8fc465654f799cde SHA256 f34ecde85c09e4ce70bea5e8f153284e3350e0da0bfc97be72b4b4c84049b102 -AUX texmacs-1.0.7-strip.patch 654 RMD160 75bb27ab53171bacea9f0d1063703c4df1094f0f SHA1 2e1ee04c1a0f7227748c2b690b63fb8490667b82 SHA256 795bc0c53f97be9ce182ac6b8a2a7e67d35e1eab51b7936e406eee637c20cefd -AUX texmacs-1.0.7.1-strip.patch 654 RMD160 75bb27ab53171bacea9f0d1063703c4df1094f0f SHA1 2e1ee04c1a0f7227748c2b690b63fb8490667b82 SHA256 795bc0c53f97be9ce182ac6b8a2a7e67d35e1eab51b7936e406eee637c20cefd +AUX texmacs-1.0.7.1-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701 DIST TeXmacs-1.0.6.14-src.tar.gz 4313953 RMD160 1558176e93527367907cc461fe6075d4c508e23a SHA1 bab1a969be883608f5ffbaef9994d6b86c43226e SHA256 6912e66665fc8f0be3510930a280f407ef29959765b5caa89cc93886df3eee1c DIST TeXmacs-1.0.6.15-src.tar.gz 4456301 RMD160 97388fd96f110bd97ff5386e50b37530c24822ee SHA1 bd11a9176c7a3627322a374cd27d5eecfcd2527f SHA256 905c740907739530973d0aaac65f2973de73c29bc2574c4dcda8db230c1ec1ac -DIST TeXmacs-1.0.7-src.tar.gz 4595103 RMD160 15eccb478ecd3204d817533eec1a6cc982c257ac SHA1 aea77447930d847e5419814b3b3e5719be18c72b SHA256 bbd435e262a9f67b87215c6c81f91f1b6c29e8c19087e31cb9d611c6afb2bec9 DIST TeXmacs-1.0.7.1-src.tar.gz 4719183 RMD160 56eeee944163ee3de5952a90ed1d80e41ed0883a SHA1 728ace4b2a101be8019a1713a862f589a1f96bb6 SHA256 5ab4917fbfc0b6863fd8c8b16b6f6a3e2591ca2abe873fa32d4c6d34d2ea28af DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 EBUILD texmacs-1.0.6.14.ebuild 1744 RMD160 e95a8829a36adb8416401f5fa487bb648aebb5bb SHA1 7e210b4bb0cdd95fb7d1f1af94d01b1df5515107 SHA256 6548b1ab8a219d98b3c702641ce29df4f37fd5e3fdb3e4e6b5583f7cce83cb00 EBUILD texmacs-1.0.6.15.ebuild 1748 RMD160 778f1b9e46abbc95e20d75a48a3af3ffb57c29d4 SHA1 e8ad6fd8e52f100f81d3f14c81b6e21739711215 SHA256 ba5ac823aa79789be9c6508b506ad089e9f6ad41258945589d35d20fef3ab129 -EBUILD texmacs-1.0.7.1.ebuild 1732 RMD160 77f4e3f408e919138e0e047acf92cf9ebeee0eb4 SHA1 fe77008b40a39c2c7251dae8dc3894eb62a71287 SHA256 714b11a89b30ae5dc0d182bac3af35d08db05ef671e952f1160002560a556b54 -EBUILD texmacs-1.0.7.ebuild 1802 RMD160 54ccda96a307bcd6fca89c4899d4c716e82d1879 SHA1 fd47299ef2f1330436b68f66c23247bd46470e6a SHA256 65d3bb641d6c859ecd387b31ef1e913ac33a6bcd8508a10e43d61c345d60408d -MISC ChangeLog 10795 RMD160 ae6dfd5edd1d91477569e7738aed915dd2393be6 SHA1 77ab9beb10573922f39a4e23f1ed38f48589ba5c SHA256 93b9568abc4e86df1a761c94ee67d1603ba7476e6ac5ba57dca5b1864959bf23 +EBUILD texmacs-1.0.7.1.ebuild 1705 RMD160 467d0453341d733f5890f459e7caa66abe844dde SHA1 2ff4f1b420c7db67ec3e2039e652999131f6abd9 SHA256 a21fe66dd6cb43e8445254bd8e1e4fb4452f17434468135f3112cc5b04c7c52d +MISC ChangeLog 11036 RMD160 6bdb56af4dfff6c5384538f79e56d29159a6245c SHA1 030aa4767c1da62007057eca3a72b8e2074ef7f5 SHA256 1266064450bc741e0793cc2e4bc83457557b230a5213842e6ba3c1890f0401e3 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813 diff --git a/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch b/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch deleted file mode 100644 index 8c956cdcdce0..000000000000 --- a/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -r -U2 TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4 TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4 ---- TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4 2008-10-16 13:41:18.000000000 +0700 -+++ TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4 2008-11-02 18:03:26.000000000 +0600 -@@ -241,5 +241,5 @@ - sed 's/^/| /' "$pro_file" >&AS_MESSAGE_LOG_FD - -- if $QMAKE -spec macx-g++ ; then :; else -+ if $QMAKE -spec linux-g++ ; then :; else - AC_MSG_ERROR([Calling $QMAKE failed.]) - fi diff --git a/app-office/texmacs/files/texmacs-1.0.7-strip.patch b/app-office/texmacs/files/texmacs-1.0.7-strip.patch deleted file mode 100644 index 838d770685ae..000000000000 --- a/app-office/texmacs/files/texmacs-1.0.7-strip.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in ---- TeXmacs-1.0.7-src.orig/Makefile.in 2008-10-16 13:41:18.000000000 +0700 -+++ TeXmacs-1.0.7-src/Makefile.in 2008-11-02 18:20:51.000000000 +0600 -@@ -129,7 +129,5 @@ - $(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin - $(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || : -- $(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin - $(CP) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || : -- $(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || : - $(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/* - $(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || : diff --git a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch index 838d770685ae..b6e660eac900 100644 --- a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch +++ b/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch @@ -1,7 +1,9 @@ -diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in ---- TeXmacs-1.0.7-src.orig/Makefile.in 2008-10-16 13:41:18.000000000 +0700 -+++ TeXmacs-1.0.7-src/Makefile.in 2008-11-02 18:20:51.000000000 +0600 -@@ -129,7 +129,5 @@ +Index: TeXmacs-1.0.7.1-src/Makefile.in +=================================================================== +--- TeXmacs-1.0.7.1-src.orig/Makefile.in ++++ TeXmacs-1.0.7.1-src/Makefile.in +@@ -130,9 +130,7 @@ INSTALL: + $(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin $(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin $(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || : - $(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin @@ -9,3 +11,4 @@ diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in - $(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || : $(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/* $(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || : + $(RM) $(DESTDIR)$(tmbin)/lib/*.a diff --git a/app-office/texmacs/texmacs-1.0.7.1.ebuild b/app-office/texmacs/texmacs-1.0.7.1.ebuild index 6c7ee56bf3ba..5a2c3ced91e0 100644 --- a/app-office/texmacs/texmacs-1.0.7.1.ebuild +++ b/app-office/texmacs/texmacs-1.0.7.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.1.ebuild,v 1.1 2009/01/02 18:48:31 grozin Exp $ -EAPI=1 +# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.1.ebuild,v 1.2 2009/01/03 06:32:35 grozin Exp $ +EAPI=2 inherit autotools MY_P=${P/tex/TeX}-src DESCRIPTION="Wysiwyg text processor with high-quality maths" @@ -15,11 +15,12 @@ SLOT="0" IUSE="imlib jpeg netpbm -qt4 svg spell" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" -RDEPEND="virtual/latex-base +RDEPEND="dev-scheme/guile[deprecated] + virtual/latex-base virtual/ghostscript - >=dev-scheme/guile-1.4 media-libs/freetype x11-libs/libXext + x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) @@ -39,21 +40,17 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { # don't strip epatch "${FILESDIR}"/${P}-strip.patch eautoreconf } -src_compile() { +src_configure() { econf $(use_with imlib imlib2) \ --enable-optimize="${CXXFLAGS}" \ $(use_enable qt4 qt) - emake || die "emake failed" } src_install() { diff --git a/app-office/texmacs/texmacs-1.0.7.ebuild b/app-office/texmacs/texmacs-1.0.7.ebuild deleted file mode 100644 index 18b28c6ae908..000000000000 --- a/app-office/texmacs/texmacs-1.0.7.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.ebuild,v 1.2 2008/11/03 16:38:59 mr_bones_ Exp $ -EAPI=1 -inherit autotools -MY_P=${P/tex/TeX}-src -DESCRIPTION="Wysiwyg text processor with high-quality maths" - -SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/targz/${MY_P}.tar.gz - ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz" - -HOMEPAGE="http://www.texmacs.org/" -LICENSE="GPL-2" -SLOT="0" -IUSE="imlib jpeg netpbm -qt4 svg spell" -KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" - -RDEPEND="virtual/latex-base - virtual/ghostscript - >=dev-scheme/guile-1.4 - media-libs/freetype - x11-libs/libXext - qt4? ( x11-libs/qt-gui:4 ) - imlib? ( media-libs/imlib2 ) - jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) - svg? ( || ( media-gfx/inkscape gnome-base/librsvg ) ) - netpbm? ( media-libs/netpbm ) - spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )" - -DEPEND="${RDEPEND} - x11-proto/xproto" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use qt4; then - ewarn "Qt port is highly experimental" - ewarn "If you want a stable TeXmacs, emerge with USE=-qt4" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # macx-g++ -> linux-g++ - epatch "${FILESDIR}"/${P}-autotroll.patch - - # don't strip - epatch "${FILESDIR}"/${P}-strip.patch - - eautoreconf -} - -src_compile() { - econf $(use_with imlib imlib2) \ - --enable-optimize="${CXXFLAGS}" \ - $(use_enable qt4 qt) - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc TODO || die "dodoc failed" - domenu "${FILESDIR}"/TeXmacs.desktop || die "domenu failed" - - # now install the fonts - insinto /usr/share/texmf - doins -r "${WORKDIR}/fonts" || die "installing fonts failed" -} |