diff options
author | Alastair Tse <liquidx@gentoo.org> | 2003-04-28 23:40:15 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2003-04-28 23:40:15 +0000 |
commit | 17cdfaf6726a6109adf305c9ecba25419cc299e6 (patch) | |
tree | dffecab9cf5560118e925336f0cae18663ef5e36 | |
parent | bumping to stable x86 (diff) | |
download | gentoo-2-17cdfaf6726a6109adf305c9ecba25419cc299e6.tar.gz gentoo-2-17cdfaf6726a6109adf305c9ecba25419cc299e6.tar.bz2 gentoo-2-17cdfaf6726a6109adf305c9ecba25419cc299e6.zip |
spring cleaning! and bump 1.1.10 to stable x86
-rw-r--r-- | gnome-extra/gtkhtml/ChangeLog | 5 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/Manifest | 7 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.4 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6-r1 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild | 79 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild | 4 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.6-r1.ebuild | 140 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild | 138 |
9 files changed, 13 insertions, 363 deletions
diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 33fb5c726d6e..217565d4cf9e 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-extra/gtkhtml # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.31 2003/04/06 11:47:48 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.32 2003/04/28 23:40:05 liquidx Exp $ + + 29 Apr 2003; Alastair Tse <liquidx@gentoo.org> gtkhtml-1.1.10.ebuild: + bumping to stable 06 Apr 2003; Martin Schlemmer <azarah@gentoo.org> gtkhtml-1.1.10.ebuild: Fix borkage with "-nls" in USE. diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest new file mode 100644 index 000000000000..78e4f3763478 --- /dev/null +++ b/gnome-extra/gtkhtml/Manifest @@ -0,0 +1,7 @@ +MD5 a9d4582ac1dafae728b4fe6b5658cf94 ChangeLog 5093 +MD5 82b06733e01c40af9c8940e96723a841 gtkhtml-1.1.7-r1.ebuild 3989 +MD5 48a8a968a396ad0266fbb8bf1c7bf7b3 gtkhtml-1.1.8.ebuild 4064 +MD5 5bd96cd8d8f77e7cd80872c6ac358473 gtkhtml-1.1.10.ebuild 4125 +MD5 622a600d2e18ba6b235183967a49888b files/digest-gtkhtml-1.1.7-r1 67 +MD5 e535d0844b7715ab85f1672f4882f7a8 files/digest-gtkhtml-1.1.8 67 +MD5 2da7540b316c5dfdd790869fdb2f4070 files/digest-gtkhtml-1.1.10 133 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.4 deleted file mode 100644 index 745272eb216e..000000000000 --- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 5216966aeb86f12b94c61d48418dd5b2 gtkhtml-1.0.4.tar.gz 1313115 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 deleted file mode 100644 index fe32c0a4ad62..000000000000 --- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b4e0098653a50e61d3b713ddb7f81d6 gtkhtml-1.1.6.tar.bz2 1077593 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6-r1 deleted file mode 100644 index fe32c0a4ad62..000000000000 --- a/gnome-extra/gtkhtml/files/digest-gtkhtml-1.1.6-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4b4e0098653a50e61d3b713ddb7f81d6 gtkhtml-1.1.6.tar.bz2 1077593 diff --git a/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild deleted file mode 100644 index 8dc29d333866..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.0.4.ebuild,v 1.9 2003/02/13 12:20:53 vapier Exp $ - -IUSE="nls gnome" - -inherit libtool || die "I lost my inheritance" -inherit flag-o-matic || die "I lost my inheritance" - -# on PPC gtkhtml gets an assertion in spell checking code with -O3 -# this is present in at least gcc-3.2. This fixes bug #11703 -if [ "${ARCH}" = "ppc" ] -then - einfo "Changing optimization to -O2 for PPC" - replace-flags -O[3-9s] -O2 -fi - -S=${WORKDIR}/${P} -DESCRIPTION="Lightweight HTML rendering/printing/editing engine." -SRC_URI="ftp://ftp.ximian.com/pub/source/evolution/${P}.tar.gz - ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="x86 ppc sparc" - -RDEPEND=">=gnome-extra/gal-0.19 - <gnome-base/control-center-1.99.0 - >=gnome-base/libghttp-1.0.9-r1 - >=dev-libs/libunicode-0.4-r1 - >=gnome-base/gnome-print-0.34 - >=gnome-base/bonobo-1.0.18 - gnome? ( <gnome-base/gconf-1.1.0 ) - nls? ( sys-devel/gettext - >=dev-util/intltool-0.11 ) - <gnome-base/libglade-0.99.0" - -DEPEND="${RDEPEND}" - -src_compile() { - elibtoolize - - local myconf="" - - use nls || myconf="${myconf} --disable-nls" - - # Evo users need to have bonobo support - #use bonobo \ - # && myconf="${myconf} --with-bonobo" \ - # || myconf="${myconf} --without-bonobo" - - use gnome \ - && myconf="${myconf} --with-gconf" \ - || myconf="${myconf} --without-gconf" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - ${myconf} || die - - emake || die "Package building failed." -} - -src_install() { - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - localstatedir=${D}/var/lib \ - install || die - - # Fix the double entry in Control Center - rm ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop - - dodoc AUTHORS COPYING* ChangeLog README - dodoc NEWS TODO -} - diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild index 1625e4df5680..583f732a5d38 100644 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild +++ b/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild,v 1.2 2003/04/06 11:47:48 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.10.ebuild,v 1.3 2003/04/28 23:40:05 liquidx Exp $ IUSE="nls gnome" @@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1" # not compile, so not sure as to what to set SLOT to .. it could be # that new versions will support 1.[12] of gtkhtml ... SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha" +KEYWORDS="x86 ~ppc ~sparc ~alpha" # peg gtkhtml at gal-0.23 because it might get confused with gal-1.99 RDEPEND="=gnome-extra/gal-0.24* diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.6-r1.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.6-r1.ebuild deleted file mode 100644 index e3af4119e761..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.6-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.6-r1.ebuild,v 1.3 2003/02/13 12:20:57 vapier Exp $ - -IUSE="nls gnome" - -inherit gnome.org libtool - -MY_PV="`echo ${PV} | cut -d. -f1,2`" -S="${WORKDIR}/${P}" -DESCRIPTION="Lightweight HTML rendering/printing/editing engine." -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2.1" -# This one lets gtkhtml-1.0 compiled stuff work, but some stuff do -# not compile, so not sure as to what to set SLOT to .. it could be -# that new versions will support 1.[12] of gtkhtml ... -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" - -RDEPEND=">=gnome-extra/gal-0.21 - <gnome-base/control-center-1.99.0 - >=gnome-base/libghttp-1.0.9-r1 - >=dev-libs/libunicode-0.4-r1 - >=gnome-base/gnome-print-0.34 - >=gnome-base/bonobo-1.0.20 - <gnome-base/gconf-1.1.0 - nls? ( sys-devel/gettext - >=dev-util/intltool-0.11 ) - <gnome-base/libglade-0.99.0" -#made gconf an absolute dep not a gnome? because it don't work w/o it. - -DEPEND="${RDEPEND}" - -src_compile() { - elibtoolize - - local myconf="" - use nls || myconf="${myconf} --disable-nls" - - # Evo users need to have bonobo support - #use bonobo \ - # && myconf="${myconf} --with-bonobo" \ - # || myconf="${myconf} --without-bonobo" - -# this breaks it. -# use gnome \ -# && myconf="${myconf} --with-gconf" \ -# || myconf="${myconf} --without-gconf" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - ${myconf} || die - - emake || die "Package building failed." -} - -# This function converts a pkgconfig config type file to -# a Conf.sh type file used by gnome-config. -# -# Usage: conv_pkgconfig_confsh foo.pc -# -# <azarah@gentoo.org> (9 Nov 2002) -conv_pkgconfig_confsh() { - - local pkgconfig_file="$1" - local confsh_file="${pkgconfig_file%%-*}Conf.sh" - local package_name="`echo ${pkgconfig_file%%-*} | awk '{print toupper($0)}'`" - local tmpfile="${T}/$$.env" - - [ "$#" -ne 1 ] && return 1 - [ ! -f ${D}/usr/lib/pkgconfig/${pkgconfig_file} ] && return 1 - - # Remove bogus info and convert to bash type file we can - # source ... - sed -e 's|: *|=|g' \ - -e '/^$/ d' \ - -e 's|$|"|g' \ - -e 's|=|="|g' \ - -e 's|Libs=|libs=|' \ - -e 's|Cflags=|cflags=|' \ - -e '/^Name.*/ d' \ - -e '/^Description.*/ d' \ - -e '/^Version.*/ d' \ - ${D}/usr/lib/pkgconfig/${pkgconfig_file} > ${tmpfile} - - source ${tmpfile} - - # Ok, generate our Conf.sh file - cat > ${D}/usr/lib/${confsh_file} <<CONFSHEND -# -# Configuration file for using the ${package_name} library in GNOME applications -# -${package_name}_LIBDIR="-L${libdir}" -${package_name}_LIBS="${libs}" -${package_name}_INCLUDEDIR="${cflags}" -${package_name}_DATADIR="${gtkhtml_datadir}" -MODULE_VERSION="${module_version}" - -CONFSHEND - - # Fix permissions - fperms 0755 /usr/lib/${confsh_file} -} - -src_install() { - local fullname="" - - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - localstatedir=${D}/var/lib \ - install || die - - # Fix the double entry in Control Center - rm -f ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop - - # This next big gets gtkhtml-1.1 to be compadible with gtkhtml-1.0. - # We basically generate a /usr/lib/gtkhtmlConf.sh so that gnome-config - # will see gtkhtml-1.1 and other older gnome apps should then be able - # to use it. We also create libgtkhtml.so and libgtkhtml.so.20 symlinks, - # and /usr/share/gtkhtml-1.1/gtkhtml symlinks for apps compiled against - # older gtkhtml to find their libs, and data .idl files. - # - # <azarah@gentoo.org> (9 Nov 2002) - conv_pkgconfig_confsh ${PN}-${MY_PV}.pc - - # Add some type of backward compat for libs... - fullname="`eval basename \`readlink ${D}/usr/lib/lib${PN}-${MY_PV}.so\``" - dosym ${fullname##*/} /usr/lib/lib${PN}.so - dosym ${fullname##*/} /usr/lib/lib${PN}.so.20 - - # For older apps to be able to find the data... - dosym '.' /usr/share/${PN}-${MY_PV}/${PN} - - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO -} - diff --git a/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild b/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild deleted file mode 100644 index 2dc85b8cf063..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-1.1.6.ebuild,v 1.4 2003/02/13 12:21:01 vapier Exp $ - -IUSE="nls gnome" - -inherit gnome.org libtool - -MY_PV="`echo ${PV} | cut -d. -f1,2`" -S="${WORKDIR}/${P}" -DESCRIPTION="Lightweight HTML rendering/printing/editing engine." -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 LGPL-2.1" -# This one lets gtkhtml-1.0 compiled stuff work, but some stuff do -# not compile, so not sure as to what to set SLOT to .. it could be -# that new versions will support 1.[12] of gtkhtml ... -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" - -RDEPEND=">=gnome-extra/gal-0.21 - <gnome-base/control-center-1.99.0 - >=gnome-base/libghttp-1.0.9-r1 - >=dev-libs/libunicode-0.4-r1 - >=gnome-base/gnome-print-0.34 - >=gnome-base/bonobo-1.0.20 - gnome? ( <gnome-base/gconf-1.1.0 ) - nls? ( sys-devel/gettext - >=dev-util/intltool-0.11 ) - <gnome-base/libglade-0.99.0" - -DEPEND="${RDEPEND}" - -src_compile() { - elibtoolize - - local myconf="" - use nls || myconf="${myconf} --disable-nls" - - # Evo users need to have bonobo support - #use bonobo \ - # && myconf="${myconf} --with-bonobo" \ - # || myconf="${myconf} --without-bonobo" - - use gnome \ - && myconf="${myconf} --with-gconf" \ - || myconf="${myconf} --without-gconf" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - ${myconf} || die - - emake || die "Package building failed." -} - -# This function converts a pkgconfig config type file to -# a Conf.sh type file used by gnome-config. -# -# Usage: conv_pkgconfig_confsh foo.pc -# -# <azarah@gentoo.org> (9 Nov 2002) -conv_pkgconfig_confsh() { - - local pkgconfig_file="$1" - local confsh_file="${pkgconfig_file%%-*}Conf.sh" - local package_name="`echo ${pkgconfig_file%%-*} | awk '{print toupper($0)}'`" - local tmpfile="${T}/$$.env" - - [ "$#" -ne 1 ] && return 1 - [ ! -f ${D}/usr/lib/pkgconfig/${pkgconfig_file} ] && return 1 - - # Remove bogus info and convert to bash type file we can - # source ... - sed -e 's|: *|=|g' \ - -e '/^$/ d' \ - -e 's|$|"|g' \ - -e 's|=|="|g' \ - -e 's|Libs=|libs=|' \ - -e 's|Cflags=|cflags=|' \ - -e '/^Name.*/ d' \ - -e '/^Description.*/ d' \ - -e '/^Version.*/ d' \ - ${D}/usr/lib/pkgconfig/${pkgconfig_file} > ${tmpfile} - - source ${tmpfile} - - # Ok, generate our Conf.sh file - cat > ${D}/usr/lib/${confsh_file} <<CONFSHEND -# -# Configuration file for using the ${package_name} library in GNOME applications -# -${package_name}_LIBDIR="-L${libdir}" -${package_name}_LIBS="${libs}" -${package_name}_INCLUDEDIR="${cflags}" -${package_name}_DATADIR="${gtkhtml_datadir}" -MODULE_VERSION="${module_version}" - -CONFSHEND - - # Fix permissions - fperms 0755 /usr/lib/${confsh_file} -} - -src_install() { - local fullname="" - - make prefix=${D}/usr \ - sysconfdir=${D}/etc \ - localstatedir=${D}/var/lib \ - install || die - - # Fix the double entry in Control Center - rm -f ${D}/usr/share/control-center/capplets/gtkhtml-properties.desktop - - # This next big gets gtkhtml-1.1 to be compadible with gtkhtml-1.0. - # We basically generate a /usr/lib/gtkhtmlConf.sh so that gnome-config - # will see gtkhtml-1.1 and other older gnome apps should then be able - # to use it. We also create libgtkhtml.so and libgtkhtml.so.20 symlinks, - # and /usr/share/gtkhtml-1.1/gtkhtml symlinks for apps compiled against - # older gtkhtml to find their libs, and data .idl files. - # - # <azarah@gentoo.org> (9 Nov 2002) - conv_pkgconfig_confsh ${PN}-${MY_PV}.pc - - # Add some type of backward compat for libs... - fullname="`eval basename \`readlink ${D}/usr/lib/lib${PN}-${MY_PV}.so\``" - dosym ${fullname##*/} /usr/lib/lib${PN}.so - dosym ${fullname##*/} /usr/lib/lib${PN}.so.20 - - # For older apps to be able to find the data... - dosym '.' /usr/share/${PN}-${MY_PV}/${PN} - - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO -} - |