diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-05-30 17:03:05 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-05-30 17:03:05 +0000 |
commit | 9b6c2774a1c75b2d7e2fcf438bf026b877102365 (patch) | |
tree | 1c00efe2eee68ecc0f41f8dab857a5a3c67900c8 /x11-libs | |
parent | x86 stable wrt bug #320439 (diff) | |
download | historical-9b6c2774a1c75b2d7e2fcf438bf026b877102365.tar.gz historical-9b6c2774a1c75b2d7e2fcf438bf026b877102365.tar.bz2 historical-9b6c2774a1c75b2d7e2fcf438bf026b877102365.zip |
Apply datadir fix from bug #31553 to latest ebuild as well
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/fltk/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/fltk/Manifest | 3 | ||||
-rw-r--r-- | x11-libs/fltk/fltk-1.1.10-r1.ebuild | 137 |
3 files changed, 145 insertions, 2 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 76ca5e6de8fd..0055a24e7112 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.157 2010/05/30 10:44:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.158 2010/05/30 17:03:05 hwoarang Exp $ + +*fltk-1.1.10-r1 (30 May 2010) + + 30 May 2010; Markos Chandras <hwoarang@gentoo.org> +fltk-1.1.10-r1.ebuild: + Apply datadir fix from bug #31553 to latest ebuild as well *fltk-1.1.9-r2 (30 May 2010) diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index b2b22303c65c..8cf5fd3f84f2 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -22,6 +22,7 @@ DIST fltk-1.1.10-source.tar.bz2 2214382 RMD160 f8fc4371811efcc0d6fc73edd0525d8ff DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde DIST fltk-2.0.x-r6786.tar.bz2 2527307 RMD160 aa9199bd7ed15b4b2fc2da976d88f7396f2fcb96 SHA1 b3bfcff643b4b6a05ed377ad87bc4b8487ee1a37 SHA256 4eed467300ae06a005d94f463a15340d9d23600846ae8821cdb2c2f64a6ac37c DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3 +EBUILD fltk-1.1.10-r1.ebuild 3805 RMD160 f02b906ccecba27b607bf661844d3359cc9b9f2f SHA1 b6a7247099f77515435f4fed9b79ab54bdc04f26 SHA256 ab3f04b5dcb055e262681d999eb29fe025d5b7f2c570b384b1508524c9243c82 EBUILD fltk-1.1.10.ebuild 3752 RMD160 2bac639bb97d54bb5f6ff1255d582e3db8962266 SHA1 d50fae926dc4dde956b2ae2faf9214e8bd8243b1 SHA256 04e56cea60b627f658c751394402dc51ea547e219e96d29ea236984272dbd729 EBUILD fltk-1.1.9-r1.ebuild 3660 RMD160 609891fc64a6887a8a1fa6b9a1e2329255acd187 SHA1 6d8468c3ffa28c1687dd1f926cc4490ddfe307d3 SHA256 04fe6647d6fc90281c84e142599cacd102a1431ce26f32da4e894b3cc3746c96 EBUILD fltk-1.1.9-r2.ebuild 3715 RMD160 09ea840feacc97b38d5f70aa6119025ada1b0c23 SHA1 f9c1d5ee143fd7e474026ef658cdd8dab80edba5 SHA256 dd4951e8fefbc9fe39a727f729d99b36a94aeaa2c57d56d04723d0d2f2d537aa @@ -30,5 +31,5 @@ EBUILD fltk-2.0_pre6786-r1.ebuild 2450 RMD160 c75cd879f6c2ffe9afb1be44cce3091954 EBUILD fltk-2.0_pre6786-r2.ebuild 2511 RMD160 3812fc8227172e1cbd825abf905d40ce54826a46 SHA1 8a6235ab73d5c8be8561624ac7ec1ac953f85305 SHA256 71ab61a96646438dbee57b39732d2ce2d6970d8a1277816656c08acddb223523 EBUILD fltk-2.0_pre6786.ebuild 2365 RMD160 5059444d13b972e3b4b6ab16eba0216f5149a32b SHA1 b76e516c4fe58eb8cd252fee880f26fb99e53827 SHA256 b460a491ca0d123b4b627f76f827f62a06e2667d5ffb5bbef159a4294821ea6e EBUILD fltk-2.0_pre6970.ebuild 2504 RMD160 df5b63eb932dc4bc9c0d3a3f547770c5ac172c08 SHA1 59b2d03e25b34a1c3617b80205d34c549bee7998 SHA256 02180e9dea176ff8b89329cf0bcb688532efb4d88ae1ff1b2ef29f02f3bf9fdb -MISC ChangeLog 21442 RMD160 21c744ea402c76a64089266da99ca795a0aaa85b SHA1 a4137fb9ccf2d3e81b6a61b85ccd916d3a1d50b1 SHA256 89ba957283dab1ec09dab0693b2e059e81c4f1276128623bc20dd2a7b69a3be1 +MISC ChangeLog 21612 RMD160 6fb421fe5abcd344be043baf80be8705e4ce1282 SHA1 3774eaa63cd7553f9ae1bac64bbabc351fdf4960 SHA256 7943799187f6dbf8519c5ba9b70b1a06ea7e700697e3b4ba6f55b29ad372db5e MISC metadata.xml 730 RMD160 b71c483e2f90c8328a31e814ef7bf1cb62a75611 SHA1 4e5669b499c22fb4059161a0e8dd62735d460f06 SHA256 5695a1eced035e0f5c8d4160c855f68e85ad3b15978b9bf88d2df16a24e79e82 diff --git a/x11-libs/fltk/fltk-1.1.10-r1.ebuild b/x11-libs/fltk/fltk-1.1.10-r1.ebuild new file mode 100644 index 000000000000..eca324c7810d --- /dev/null +++ b/x11-libs/fltk/fltk-1.1.10-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.10-r1.ebuild,v 1.1 2010/05/30 17:03:05 hwoarang Exp $ + +EAPI=2 +inherit eutils autotools versionator fdo-mime + +DESCRIPTION="C++ user interface toolkit for X and OpenGL." +HOMEPAGE="http://www.fltk.org" +SRC_URI="mirror://easysw/${PN}/${PV}/${P}-source.tar.bz2" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +LICENSE="FLTK LGPL-2" + +SLOT="$(get_version_component_range 1-2)" + +IUSE="debug doc examples games opengl threads xft xinerama" + +RDEPEND="x11-libs/libXext + x11-libs/libICE + x11-libs/libSM + x11-libs/libXt + media-libs/jpeg + media-libs/libpng + sys-libs/zlib + opengl? ( virtual/opengl virtual/glu ) + xinerama? ( x11-libs/libXinerama ) + xft? ( x11-libs/libXft ) + >=sys-libs/glibc-2.10" # glibc-2.10 patch breaks with 2.9, bug 276695 +DEPEND="${RDEPEND} + x11-proto/xextproto + doc? ( app-text/htmldoc ) + xinerama? ( x11-proto/xineramaproto )" + +INCDIR=/usr/include/fltk-${SLOT} +LIBDIR=/usr/$(get_libdir)/fltk-${SLOT} + +src_prepare() { + epatch "${FILESDIR}"/fltk-1.1.9-share.patch + #epatch "${FILESDIR}"/${P}-fromdebian.patch + epatch "${FILESDIR}"/${PN}-1.1.9-desktop.patch + epatch "${FILESDIR}"/${PN}-1.1.9-as-needed.patch + # prevent to run twice configure (needs eautoconf), to compile tests, + # remove forced -Os compile + epatch "${FILESDIR}"/${PN}-1.1.9-conf-tests.patch + # fix stricter c++ handling in glibc-2.10/gcc-4.4 (bug 270487) + epatch "${FILESDIR}"/${PN}-1.1.9-glibc2.10-scandir.patch + # remove forced flags from fltk-config + sed -i \ + -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ + -e '/^LDFLAGS=/d' \ + "${S}/fltk-config.in" || die + # some fixes introduced because slotting + sed -i \ + -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ + src/Makefile || die + # docs in proper docdir + sed -i \ + -e "/^docdir/s:fltk:${PF}/html:" \ + makeinclude.in || die + sed -e "s/7/$(get_version_component_range 3)/" \ + "${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake + eautoconf +} + +src_configure() { + econf \ + --includedir=${INCDIR}\ + --libdir=${LIBDIR} \ + --docdir=/usr/share/doc/${PF}/html \ + --enable-largefile \ + --enable-shared \ + --enable-xdbe \ + --disable-localjpeg \ + --disable-localpng \ + --disable-localzlib \ + $(use_enable debug) \ + $(use_enable opengl gl) \ + $(use_enable threads) \ + $(use_enable xft) \ + $(use_enable xinerama) +} + +src_compile() { + emake || die "emake failed" + if use doc; then + cd "${S}"/documentation + emake alldocs || die "emake doc failed" + fi + if use games; then + cd "${S}"/test + emake blocks checkers sudoku || die "emake games failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + emake -C fluid \ + DESTDIR="${D}" install-linux || die "emake install fluid failed" + if use doc; then + emake -C documentation \ + DESTDIR="${D}" install || die "emake install doc failed" + fi + local apps="fluid" + if use games; then + emake -C test \ + DESTDIR="${D}" install-linux || die "emake install games failed" + emake -C documentation \ + DESTDIR="${D}" install-linux || die "emake install doc games failed" + apps="${apps} sudoku blocks checkers" + fi + for app in ${apps}; do + dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \ + /usr/share/pixmaps/${app}.png + done + dodoc CHANGES README CREDITS ANNOUNCEMENT + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins test/*.{h,cxx,fl} test/demo.menu + fi + + insinto /usr/share/cmake/Modules + doins CMake/FLTK*.cmake + + echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT} + echo "FLTK_DOCDIR=/usr/share/doc/${PF}/html" >> 99fltk-${SLOT} + doenvd 99fltk-${SLOT} +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} |