diff options
| -rw-r--r-- | x11-libs/fox-wrapper/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-libs/fox-wrapper/files/digest-fox-wrapper-1 | 0 | ||||
| -rw-r--r-- | x11-libs/fox-wrapper/files/fox-wrapper-1.sh | 76 | ||||
| -rw-r--r-- | x11-libs/fox-wrapper/fox-wrapper-1.ebuild | 24 | ||||
| -rw-r--r-- | x11-libs/fxscintilla/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/fxscintilla/files/1.62-fox-SLOT.patch | 98 | ||||
| -rw-r--r-- | x11-libs/fxscintilla/files/1.62-shared-libs.patch | 19 | ||||
| -rw-r--r-- | x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 | 1 | ||||
| -rw-r--r-- | x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild | 89 |
9 files changed, 325 insertions, 1 deletions
diff --git a/x11-libs/fox-wrapper/ChangeLog b/x11-libs/fox-wrapper/ChangeLog new file mode 100644 index 000000000000..4ee286e7b23d --- /dev/null +++ b/x11-libs/fox-wrapper/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for x11-libs/fox-wrapper +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/ChangeLog,v 1.1 2005/05/07 19:38:54 rphillips Exp $ + +*fox-wrapper-1 (07 May 2005) + + 07 May 2005; <rphillips@gentoo.org> +fox-wrapper-1.ebuild: + Added Yaakov Selkowitz's eclass based fox ebuilds for testing. + Fixes #88924 + diff --git a/x11-libs/fox-wrapper/files/digest-fox-wrapper-1 b/x11-libs/fox-wrapper/files/digest-fox-wrapper-1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/x11-libs/fox-wrapper/files/digest-fox-wrapper-1 diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-1.sh b/x11-libs/fox-wrapper/files/fox-wrapper-1.sh new file mode 100644 index 000000000000..17a3f1a97025 --- /dev/null +++ b/x11-libs/fox-wrapper/files/fox-wrapper-1.sh @@ -0,0 +1,76 @@ +#!/bin/bash +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/files/fox-wrapper-1.sh,v 1.1 2005/05/07 19:38:54 rphillips Exp $ + +# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1) +# +# Executes the correct fox-config version, based on the value of WANT_FOX. +# All versions of fox after 1.0.x ship with a fox-config script +# +# +# Stable branches first, in descending order, then unstable branches. +# After a new stable branch, prepend the new version and bump (or remove) +# the last unstable branch +# +vers="1.4 1.2 1.5" +bindir=/usr/bin + +if [ "${0##*/}" = "fox-wrapper.sh" ] ; then + echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2 + exit 1 +fi + +if [ -z "${WANT_FOX}" ] ; then + echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2 + echo " WANT_FOX=\"1.2\" fox-config $@" + exit 1 +fi + +for v in ${vers} ; do + eval binary_${v/./_}="fox-${v}-config" +done + +# +# Check the WANT_FOX setting +# +for v in ${vers} x ; do + if [ "${v}" = "x" ] ; then + echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2 + echo " Valid values of WANT_FOX are: ${vers// /, }" + exit 1 + fi + + if [ "${WANT_FOX}" = "${v}" ] ; then + binary="binary_${v/./_}" + binary="${!binary}" + break + fi +done + +if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then + echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2 + echo "fox-wrapper: DEBUG: will execute <$binary>" >&2 +fi + +# +# for further consistency +# +for v in ${vers} ; do + mybin="binary_${v/./_}" + if [ "${binary}" = "${!mybin}" ] ; then + export WANT_FOX="${v}" + fi +done + +# +# Now try to run the binary +# +if [ ! -x "${bindir}/${binary}" ] ; then + echo "fox-wrapper: $binary is missing or not executable." >&2 + echo " Please try emerging the correct version of fox, i.e.:" >&2 + echo " emerge '=x11-libs/${binary/-config/}*'" >&2 + exit 1 +fi + +"$binary" "$@" diff --git a/x11-libs/fox-wrapper/fox-wrapper-1.ebuild b/x11-libs/fox-wrapper/fox-wrapper-1.ebuild new file mode 100644 index 000000000000..4407a0a8e705 --- /dev/null +++ b/x11-libs/fox-wrapper/fox-wrapper-1.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox-wrapper/fox-wrapper-1.ebuild,v 1.1 2005/05/07 19:38:54 rphillips Exp $ + +DESCRIPTION="wrapper for fox-config to manage multiple versions" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~ppc ~ppc64 ~sparc" +IUSE="" + +DEPEND="" + +S=${WORKDIR} + +src_install() { + exeinto /usr/lib/misc + newexe ${FILESDIR}/fox-wrapper-${PV}.sh fox-wrapper.sh || die + + dodir /usr/bin + dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config +} diff --git a/x11-libs/fxscintilla/ChangeLog b/x11-libs/fxscintilla/ChangeLog index 940e22223a8e..df3be6df6b9b 100644 --- a/x11-libs/fxscintilla/ChangeLog +++ b/x11-libs/fxscintilla/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/fxscintilla # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.13 2005/05/04 11:57:54 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.14 2005/05/07 19:40:49 rphillips Exp $ + +*fxscintilla-1.62-r1 (07 May 2005) + + 07 May 2005; <rphillips@gentoo.org> +files/1.62-fox-SLOT.patch, + +files/1.62-shared-libs.patch, +fxscintilla-1.62-r1.ebuild: + Added Yaakov Selkowitz's eclass based fox ebuilds for testing. + Fixes #88924 04 May 2005; Guy Martin <gmsoft@gentoo.org> fxscintilla-1.62.ebuild: Stable on hppa. diff --git a/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch b/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch new file mode 100644 index 000000000000..9b1efe2d9f84 --- /dev/null +++ b/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch @@ -0,0 +1,98 @@ +--- fxscintilla-1.62-orig/src/Makefile.am 2003-08-08 15:04:16.000000000 -0400 ++++ fxscintilla-1.62/src/Makefile.am 2005-04-07 01:33:32.000000000 -0400 +@@ -17,20 +17,20 @@ + AM_LDFLAGS = -mwindows + endif # MinGW32 + +-lib_LTLIBRARIES = libfxscintilla.la ++lib_LTLIBRARIES = ++ ++if HAVE_FOX_1_0 ++lib_LTLIBRARIES += libfxscintilla.la + + libfxscintilla_la_SOURCES = \ + PlatFOX.cxx \ + ScintillaFOX.cxx + +-libfxscintilla_la_LIBADD = \ +- $(top_builddir)/scintilla/src/libscintilla.la +- + ## No need for ltdl with Fox 1.1 +-if HAVE_FOX_1_0 +-libfxscintilla_la_LIBADD += \ +- $(top_builddir)/ltdl/libltdl.la +-endif # HAVE_FOX_1_0 ++libfxscintilla_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintilla.la \ ++ $(top_builddir)/ltdl/libltdl.la \ ++ -L$(FOX_LIB_DIR) -lFOX + + libfxscintilla_la_LDFLAGS = \ + -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE) +@@ -46,10 +46,48 @@ + PlatFOX.cxx \ + ScintillaFOX.cxx + +-libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la ++libfxscintillanolexer_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintillanolexer.la \ ++ -L$(FOX_LIB_DIR) -lFOX + + libfxscintillanolexer_la_LDFLAGS = \ + -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE) + + endif # NOLEXER ++endif # HAVE_FOX_1_0 ++ ++ ++if HAVE_FOX_1_2 ++lib_LTLIBRARIES += libfxscintilla-1.2.la ++ ++libfxscintilla_1_2_la_SOURCES = \ ++ PlatFOX.cxx \ ++ ScintillaFOX.cxx ++ ++libfxscintilla_1_2_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintilla.la \ ++ -L$(FOX_LIB_DIR) -lFOX-1.2 + ++libfxscintilla_1_2_la_LDFLAGS = \ ++ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE) ++ ++libfxscintilla_1_2_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER ++ ++## NoLexer enabled ++if NOLEXER ++ ++lib_LTLIBRARIES += libfxscintillanolexer-1.2.la ++ ++libfxscintillanolexer_1_2_la_SOURCES = \ ++ PlatFOX.cxx \ ++ ScintillaFOX.cxx ++ ++libfxscintillanolexer_1_2_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintillanolexer.la \ ++ -L$(FOX_LIB_DIR) -lFOX-1.2 ++ ++libfxscintillanolexer_1_2_la_LDFLAGS = \ ++ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE) ++ ++endif # NOLEXER ++endif # HAVE_FOX_1_2 +--- fxscintilla-1.62-orig/tests/Makefile.am 2004-05-24 16:29:27.000000000 -0400 ++++ fxscintilla-1.62/tests/Makefile.am 2005-04-06 23:37:35.000000000 -0400 +@@ -1,12 +1,11 @@ + INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR) +-LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la + + if HAVE_FOX_1_0 +-LDADD += -lFOX ++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la -lFOX + endif + + if HAVE_FOX_1_2 +-LDADD += -lFOX-1.2 ++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2 + endif + + AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER diff --git a/x11-libs/fxscintilla/files/1.62-shared-libs.patch b/x11-libs/fxscintilla/files/1.62-shared-libs.patch new file mode 100644 index 000000000000..a52c2a00ec39 --- /dev/null +++ b/x11-libs/fxscintilla/files/1.62-shared-libs.patch @@ -0,0 +1,19 @@ +--- fxscintilla-1.62-orig/configure.in 2005-01-16 11:26:34.000000000 -0500 ++++ fxscintilla-1.62/configure.in 2005-01-16 11:27:40.000000000 -0500 +@@ -13,9 +13,6 @@ + AM_CONDITIONAL(HAVE_MINGW32, test x"$HAVE_MINGW32" = xyes) + + dnl Using libtool +-if test x"$HAVE_CYGWIN" = xyes -o x"$HAVE_MINGW32" = xyes; then +- AC_DISABLE_SHARED +-fi + AM_PROG_LIBTOOL + + dnl Must have a C++ compiler +--- fxscintilla-1.62-orig/Makefile.am 2005-01-16 11:41:12.000000000 -0500 ++++ fxscintilla-1.62/Makefile.am 2005-01-16 11:40:50.000000000 -0500 +@@ -1 +1,4 @@ + SUBDIRS = scintilla include ltdl src tests . ++ ++ACLOCAL_AMFLAGS = -I config ++ diff --git a/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 b/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 new file mode 100644 index 000000000000..036bd4446ae3 --- /dev/null +++ b/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 @@ -0,0 +1 @@ +MD5 c4cb1b9d954b92e1e1fdcb75597662c6 fxscintilla-1.62.tar.gz 833249 diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild new file mode 100644 index 000000000000..7e9fa2b7273b --- /dev/null +++ b/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild,v 1.1 2005/05/07 19:40:49 rphillips Exp $ + +inherit eutils + +DESCRIPTION="A free source code editing component for the FOX-Toolkit" +HOMEPAGE="http://www.nongnu.org/fxscintilla/" +SRC_URI="http://savannah.nongnu.org/download/fxscintilla/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha" +IUSE="doc" + +DEPEND="=x11-libs/fox-1.0* + =x11-libs/fox-1.2*" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/1.62-shared-libs.patch || die + epatch ${FILESDIR}/1.62-fox-SLOT.patch || die + + einfo "Running autoreconf..." + touch NEWS AUTHORS + autoreconf --install --force || die "autoreconf error" +} + +src_compile () { + # Borrowed from wxGTK ebuild + + einfo "Building ${PN} for FOX-1.0..." + mkdir ${S}/build_1_0 + cd ${S}/build_1_0 + ../configure \ + --prefix=/usr \ + --includedir=/usr/include \ + --libdir=/usr/lib \ + ${EXTRA_ECONF} \ + --enable-nolexer \ + --with-fox-1-0 \ + --with-foxinclude=${ROOT}usr/include \ + --with-foxlib=${ROOT}usr/lib \ + || die "configure error" + emake || die "make error" + + einfo "Building ${PN} for FOX-1.2..." + mkdir ${S}/build_1_2 + cd ${S}/build_1_2 + ../configure \ + --prefix=/usr \ + --includedir=/usr/include \ + --libdir=/usr/lib \ + ${EXTRA_ECONF} \ + --enable-nolexer \ + --with-foxinclude=${ROOT}usr/include \ + --with-foxlib=${ROOT}usr/lib \ + || die "configure error" + emake || die "make error" +} + +src_install () { + cd ${S}/build_1_0 + make DESTDIR="${D}" install || die "make install error" + + cd ${S}/build_1_2 + make DESTDIR="${D}" install || die "make install error" + + cd ${S} + dodoc README + if use doc ; then + dodoc scintilla/doc/Lexer.txt + dohtml scintilla/doc/* + fi +} + +pkg_postinst() { + ewarn + ewarn "New as of 1.62-r1:" + ewarn "FXScintilla is now built separately against FOX-1.0 and FOX-1.2." + ewarn "For FOX-1.2, the library is called libfxscintilla-1.2." + ewarn "Anything linked against previous releases of FOX-1.2 and fxscintilla" + ewarn "may need to be rebuilt." + ewarn + einfo "The nolexer libraries are now included in this release as well." + epause 5 +} |