diff options
author | 2011-05-21 11:00:42 +0000 | |
---|---|---|
committer | 2011-05-21 11:00:42 +0000 | |
commit | 09b4a50f5561bb3a76060c809de618389e6be110 (patch) | |
tree | 277c488178c9c181cdf89c70edbc8a100ac516be /x11-libs | |
parent | Version bump. Update to EAPI 4. (diff) | |
download | historical-09b4a50f5561bb3a76060c809de618389e6be110.tar.gz historical-09b4a50f5561bb3a76060c809de618389e6be110.tar.bz2 historical-09b4a50f5561bb3a76060c809de618389e6be110.zip |
Version Bump
Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/fltk/ChangeLog | 9 | ||||
-rw-r--r-- | x11-libs/fltk/Manifest | 16 | ||||
-rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch | 13 | ||||
-rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch | 163 | ||||
-rw-r--r-- | x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch | 44 | ||||
-rw-r--r-- | x11-libs/fltk/fltk-1.3.0_rc5.ebuild | 153 |
6 files changed, 378 insertions, 20 deletions
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog index 4b2f7d2ef332..5650cac05c86 100644 --- a/x11-libs/fltk/ChangeLog +++ b/x11-libs/fltk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/fltk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.176 2011/05/01 17:14:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.177 2011/05/21 11:00:42 jlec Exp $ + +*fltk-1.3.0_rc5 (21 May 2011) + + 21 May 2011; Justin Lecher <jlec@gentoo.org> +fltk-1.3.0_rc5.ebuild, + files/fltk-1.3.0_rc3-conf-tests.patch, +files/fltk-1.3.0_rc5-as-needed.patch, + +files/fltk-1.3.0_rc5-share.patch: + Version Bump 01 May 2011; Raúl Porcel <armin76@gentoo.org> fltk-1.1.9-r1.ebuild, fltk-1.1.9-r2.ebuild, fltk-1.1.10-r1.ebuild, fltk-1.1.10-r2.ebuild, diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index b56f98e0c4e9..932e7f7c9663 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -15,8 +15,10 @@ AUX fltk-1.1.9-desktop.patch 400 RMD160 c287cade8fe936db0334e1c364c8165512da9bd4 AUX fltk-1.1.9-glibc2.10-scandir.patch 736 RMD160 d2d28d50a5704bc64639a82ab2d7910220efd2b2 SHA1 72460b2d9e6e049b5e37fbe73930712e9ded8051 SHA256 bc7ba1695141ccd35908656e310577f10ac0a8866d8bdea6225e38970c82c7c7 AUX fltk-1.1.9-share.patch 1892 RMD160 90f3939425ac31868a5cbbb01b66dcdb41a26e0d SHA1 12d37ac1dd6d2425b03ac964464049af3a048139 SHA256 3818c7b31ebc06e545facd409268dfb89dff8d889083b00f32fe79baafb7d56f AUX fltk-1.3.0_rc3-as-needed.patch 5928 RMD160 84ec102f84e1f48e4f7ed721d2191078ea309626 SHA1 9b05dcb4f3a6f64cac1f354158afc1f860677b01 SHA256 94efe359053d44930df484c80c103cb679d24427ffbf8ed0e94890364ded381a -AUX fltk-1.3.0_rc3-conf-tests.patch 3175 RMD160 4ef5f3def635aec9613e708d9e484713336ee0d2 SHA1 658e1a747c567a0ae48bc95d66f9db3ecdfbbe73 SHA256 03e24be5633aca688bf6e2d6437e894db0b43e30d0386ec457e97536b3397b01 +AUX fltk-1.3.0_rc3-conf-tests.patch 2862 RMD160 73f7318207cd8f6dc7f61ac85c6f27319d7c25cd SHA1 8a02cac9aeff7def4c459121b9f4488f2bdc05b5 SHA256 880037a60db7d120a87d9d90557cad4f0298de3e994621d00706d29b48585512 AUX fltk-1.3.0_rc3-share.patch 1918 RMD160 bac0703ac9675a86f425580a73ba298eabafd0b1 SHA1 387c1304d998e8478b641b324c151a97324a5f7d SHA256 926445289abfb510f774df17c634bf3c897ad43b6fa10a666645bb2c5cd60ee0 +AUX fltk-1.3.0_rc5-as-needed.patch 6090 RMD160 e3c1f74cf8c3cc61a0dfb15c1eec8ae7e7d0abe1 SHA1 c982a609c0b4086d242d2db1d7ea69d241cd9e37 SHA256 88944dc4e88c312dd84adaaa392bf4aedeb3e8ed0bb14ef8f0b2a5c8eac23158 +AUX fltk-1.3.0_rc5-share.patch 2015 RMD160 7bd89b2b3dc35a80349b0ad71b378ebc2bb0eb1d SHA1 f1001ec8da36cc5e2f46ecafeff7ea2a35439179 SHA256 9d756497b7c880b8eac8ab4a60de279cad36ef0a932e6a4d6364117d5003502a AUX fltk-2.0_pre6970-libpng14.patch 339 RMD160 a6fe78f6518b31fd93410df1859832681945e7a3 SHA1 7dc0edee28c336e6ee6ddf4a6a4a45c086e39912 SHA256 ff4b1a7da84cbf1dc3a974a2461a5e1c02965a61b13e6b2a34904f731854a4a6 AUX fltk-2.0_pre6970-libpng15.patch 254 RMD160 951de43594f76efcb166538acf0b0f3b7c904ce3 SHA1 c42c60474a0c48a33a7b087316b9ce6ade0b4c52 SHA256 ea5f3e8b17ecfc5662fa965a386b0db8fe821faa885d49489ead6046039aaa6d AUX fltk2-asneeded.patch 1902 RMD160 750e9ca9a57237f2c693d29422352778abf6135f SHA1 d7273b03085d69b35ae332cf2e2e215480ec4ad7 SHA256 aa532cba342f7315efd08578431acab746bb3a499eada984b35a44fe6b30580f @@ -29,20 +31,22 @@ AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 13630 DIST fltk-1.1.10-source.tar.bz2 2214382 RMD160 f8fc4371811efcc0d6fc73edd0525d8ff87a4faa SHA1 0d2b34fede91fa78eeaefb893dd70282f73908a8 SHA256 37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a DIST fltk-1.1.9-source.tar.bz2 2206178 RMD160 f22e83fc9fd5e8bc10f0eea55e1a4df2ba132d91 SHA1 6f21903dc53c829ec71e8e49655eb19e624c8247 SHA256 facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde DIST fltk-1.3.0rc3-source.tar.gz 3783896 RMD160 716b9a91bc362125eb0a8356e176cd8b50f5fb94 SHA1 d7a31ab154f54a686a629f385ea5f5e2b71fd310 SHA256 4221ade5df9872e29d94f203c2eb69d778dcfd82beb39b781cb4036d993fcd6c +DIST fltk-1.3.0rc5-source.tar.gz 4111870 RMD160 c1016f09ec1c6d085895a867428ac2566d0b1231 SHA1 986279403844d3b06e4ba0d59aaedd24b4e02ee2 SHA256 dbbfc47256e31d5d1388e0d3d920386b984fd4b66a4261ee903c29ad080325b9 DIST fltk-2.0.x-r6970.tar.bz2 2529193 RMD160 5d114b5861807a15638d2b0f7ac55a909c1b6870 SHA1 0aaa688786a858b7af84e992d5438aab4ba84b0e SHA256 0d88c16967ca40b26a70736b0d6874046c31a9e74816806816252e4eb72a84a3 EBUILD fltk-1.1.10-r1.ebuild 3841 RMD160 b3fa34cc3d752ba49cdcbacd26b08dec2146d3a0 SHA1 a3233e8a45f04173acf6bd600d881fab4ecaf918 SHA256 caf5f38d646dc34f71d198327697946aca480537b5dddad931ac9de19f6a0b0f EBUILD fltk-1.1.10-r2.ebuild 3910 RMD160 4e85a0cc4563cf47b9ccdbb961dba9c46d8f8d7e SHA1 8a7d43b54efa23976f0d38b424af6e06da12dc91 SHA256 c3529044c3ad76eec275fc3172a9404cbc981146ec4758d2056767c7d6860882 EBUILD fltk-1.1.9-r1.ebuild 3619 RMD160 2bd5e83b47f77db7c566dd2e3c353a63f74d5117 SHA1 46f3f8a20abe86a615b614f639a272b546af3c0a SHA256 8eb271dff418f167f8886fc6de4157f6d346d07de91187a5506378b95c752dfd EBUILD fltk-1.1.9-r2.ebuild 3671 RMD160 fd9068342e3e985426620855bda5bbb3cd8f8dfe SHA1 49ecf5a53c331ec2db09a6102594fb5cb617b045 SHA256 11ad1beed24ddf4e6c2626534973ae7d3151f59ad46efaffba18d42d0d480298 EBUILD fltk-1.3.0_rc3-r1.ebuild 3809 RMD160 c8bf979b6c8600db2f79154f67530b38b782c58d SHA1 4a3ed4201ce7723b02c58c6908d3fcc2d82cb4d6 SHA256 a3e2303b13b7d592208aa18ad0494a9aace2b586f225fea1b891f2f403c4df14 +EBUILD fltk-1.3.0_rc5.ebuild 3856 RMD160 722782dcc85e0c6f6542c157ef7fd270826c496a SHA1 fa3f0766bd31051b99a6e3f3fb89d742ebc872ee SHA256 fc201517295d6c6b429b8565a9b879f2c110918eb1d8c36460476e8da1551643 EBUILD fltk-2.0_pre6970-r1.ebuild 2643 RMD160 3f2586e399d6d8d528458de6290474c6d8f71745 SHA1 231219d7b2a21b5f19fae8c1381add0c3d44b61c SHA256 30bcdb648e978978ea3f6e183efac6f02f008fbe345cde19c3257ad95e50a2d6 EBUILD fltk-2.0_pre6970.ebuild 2499 RMD160 473e33748481ede77d977856375059b48994667e SHA1 d4b27ae1b48a9573104cd62ca106ad2ff9359acb SHA256 9151a4aaf72a4d22301cd16c8cf06461410a5121939162347da14c3106c4bffd -MISC ChangeLog 24532 RMD160 add8aef4a9d352fc00dfb3342c7668304ec47c35 SHA1 7737cd7e96aca422bc9458befea3dc85773a2d8b SHA256 28efc31b2986c3d8ca5089a788cfaf891896a271086a674c5b14e3df7fca7998 +MISC ChangeLog 24764 RMD160 363f5cb4db8f42f9761f2603e99e42647dfac76e SHA1 6cabfecba0b70f9d33e9cdc6ab38116478d75894 SHA256 6d8cfb126a1b9acb11c0f7c51d2f7f68b831befed41f9f8599250a1e044cfdca MISC metadata.xml 657 RMD160 24969ef07785738fc34d10c79dcc854d2a895ec3 SHA1 8afd06ddc3b01090acf0333f2ac41fc4a692f504 SHA256 f37b711686e55a32ab4a1e050ee6e98fbfd7e6d7839c53926b6103fff61c44b1 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk29lQAACgkQuQc30/atMkCxRQCdHEFXp6PInw7i9YCY56Nej2fR -b/EAniCWhL/8ix3CcWYLMLAnCYiP5nj5 -=lijw +iEYEARECAAYFAk3Xm2UACgkQgAnW8HDreRaLNACfYPypHGAYQ8Lzt4NxM1S3MYk2 +HIsAoMck82I8B4FpgroAAECwlThHiKAo +=slFS -----END PGP SIGNATURE----- diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch index e3abdf3d682d..f5e2a1fdbfe2 100644 --- a/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch +++ b/x11-libs/fltk/files/fltk-1.3.0_rc3-conf-tests.patch @@ -32,19 +32,6 @@ index ccec15c..747625e 100644 portable-dist: epm -v -s fltk.xpm fltk -diff --git a/configure.in b/configure.in -index 3ca79ef..bf0dc28 100644 ---- a/configure.in -+++ b/configure.in -@@ -1114,7 +1114,7 @@ if test -n "$GCC"; then - if test "x$with_optim" != x; then - OPTIM="$with_optim $OPTIM" - else -- OPTIM="-Os $OPTIM" -+ OPTIM="$OPTIM" - fi - fi - diff --git a/documentation/Makefile b/documentation/Makefile index 1742cfa..8102c43 100644 --- a/documentation/Makefile diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch new file mode 100644 index 000000000000..0c516af616db --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.0_rc5-as-needed.patch @@ -0,0 +1,163 @@ + cairo/Makefile | 4 ++-- + configure.in | 9 +++------ + src/Makefile | 24 ++++++++++++------------ + 3 files changed, 17 insertions(+), 20 deletions(-) + +diff --git a/cairo/Makefile b/cairo/Makefile +index 3cefc9f..445cd9c 100644 +--- a/cairo/Makefile ++++ b/cairo/Makefile +@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS) + + libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk ++ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) + $(RM) libfltk_cairo.so + $(LN) $(CAIRODSONAME) libfltk_cairo.so + + libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk ++ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS) + $(RM) libfltk_cairo.sl + $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl + +diff --git a/configure.in b/configure.in +index 762d3f9..56a5d97 100644 +--- a/configure.in ++++ b/configure.in +@@ -152,7 +152,7 @@ if test x$enable_cairoext = xyes; then + dnl we do not rely on pkg-config . + CAIRODIR="cairo" + CAIROFLAGS="`pkg-config --cflags cairo`" +- CAIROLIBS="-lcairo -lpixman-1" ++ CAIROLIBS="`pkg-config --libs cairo pixman-1`" + CXXFLAGS="$CAIROFLAGS $CXXFLAGS" + LINKFLTKCAIRO="../lib/libfltk_cairo.a" + FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" +@@ -166,7 +166,7 @@ else + dnl we do not rely on pkg-config . + CAIRODIR="cairo" + CAIROFLAGS="`pkg-config --cflags cairo`" +- CAIROLIBS="-lcairo -lpixman-1" ++ CAIROLIBS="`pkg-config --libs cairo pixman-1`" + CXXFLAGS="$CAIROFLAGS $CXXFLAGS" + LINKFLTKCAIRO="../lib/libfltk_cairo.a" + FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX" +@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then + GLDSONAME="libfltk_gl.so.$FL_API_VERSION" + IMGDSONAME="libfltk_images.so.$FL_API_VERSION" + CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION" +- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o" +- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then +- DSOLINK="-Wl,-rpath,$libdir" +- fi ++ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o" + ;; + AIX*) + DSONAME="libfltk_s.a" +diff --git a/src/Makefile b/src/Makefile +index 7806854..a43106e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS) + + libfltk.so.1.3: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(OBJECTS) ++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) + $(RM) libfltk.so + $(LN) libfltk.so.1.3 libfltk.so + + libfltk.sl.1.3: $(OBJECTS) + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(OBJECTS) ++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS) + $(RM) libfltk.sl + $(LN) libfltk.sl.1.3 libfltk.sl + +@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS) + + libfltk_s.a: $(OBJECTS) + echo $(DSOCOMMAND) libfltk_s.o ... +- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) ++ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_s.a libfltk_s.o +@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS) + + libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk + $(RM) libfltk_forms.so + $(LN) libfltk_forms.so.1.3 libfltk_forms.so + + libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk + $(RM) libfltk_forms.sl + $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl + +@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib + + libfltk_forms_s.a: $(FLOBJECTS) + echo $(DSOCOMMAND) libfltk_forms_s.o ... +- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) ++ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o +@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS) + + libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB) + $(RM) libfltk_gl.so + $(LN) libfltk_gl.so.1.3 libfltk_gl.so + + libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk ++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk + $(RM) libfltk_gl.sl + $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl + +@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib + + libfltk_gl_s.a: $(GLOBJECTS) + echo $(DSOCOMMAND) libfltk_gl_s.o ... +- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) ++ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB) + echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o +@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS) + + libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk ++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk + $(RM) libfltk_images.so + $(LN) libfltk_images.so.1.3 libfltk_images.so + + libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3 + echo $(DSOCOMMAND) $@ ... +- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk ++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk + $(RM) libfltk_images.sl + $(LN) libfltk_images.sl.1.3 libfltk_images.sl + +@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib + + libfltk_images_s.a: $(IMGOBJECTS) + echo $(DSOCOMMAND) libfltk_images_s.o ... +- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) ++ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS) + echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o + $(RM) $@ + $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o diff --git a/x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch b/x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch new file mode 100644 index 000000000000..4b4267a4986c --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.3.0_rc5-share.patch @@ -0,0 +1,44 @@ + fluid/Makefile | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/fluid/Makefile b/fluid/Makefile +index 1cb3210..9d438a5 100644 +--- a/fluid/Makefile ++++ b/fluid/Makefile +@@ -82,16 +82,16 @@ install: all + $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT) + + install-linux: +- -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications +- $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications ++ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications ++ $(INSTALL_DATA) fluid.desktop $(DESTDIR)$(datadir)/applications + for size in 16 32 48 64 128; do \ +- if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \ +- $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \ ++ if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \ ++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \ + fi; \ +- $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ ++ $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \ + done +- -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application +- $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application ++ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application ++ $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)$(datadir)/mimelnk/application + + install-osx: + echo Installing Fluid in $(DESTDIR)/Applications... +@@ -109,9 +109,9 @@ uninstall: + $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT) + + uninstall-linux: +- $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop +- $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png +- $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop ++ $(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop ++ $(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png ++ $(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop + + uninstall-osx: + $(RM) -r $(DESTDIR)/Applications/fluid.app diff --git a/x11-libs/fltk/fltk-1.3.0_rc5.ebuild b/x11-libs/fltk/fltk-1.3.0_rc5.ebuild new file mode 100644 index 000000000000..3b4fa5613bf8 --- /dev/null +++ b/x11-libs/fltk/fltk-1.3.0_rc5.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.0_rc5.ebuild,v 1.1 2011/05/21 11:00:42 jlec Exp $ + +EAPI=3 + +inherit eutils autotools versionator fdo-mime + +MY_P=${P/_} + +DESCRIPTION="C++ user interface toolkit for X and OpenGL" +HOMEPAGE="http://www.fltk.org/" +SRC_URI="mirror://easysw/${PN}/${PV/_}/${P/_}-source.tar.gz" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +LICENSE="FLTK LGPL-2" + +SLOT="1" + +IUSE="cairo debug doc examples games opengl pdf threads xft xinerama" + +#RESTRICT="strip" + +RDEPEND="x11-libs/libXext + x11-libs/libICE + x11-libs/libSM + x11-libs/libXt + virtual/jpeg + media-libs/libpng + sys-libs/zlib + opengl? ( virtual/opengl ) + xinerama? ( x11-libs/libXinerama ) + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND} + x11-proto/xextproto + doc? ( + app-doc/doxygen + pdf? ( dev-texlive/texlive-latex ) + ) + xinerama? ( x11-proto/xineramaproto )" + +INCDIR=${EPREFIX}/usr/include/fltk-${SLOT} +LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT} + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-as-needed.patch \ + "${FILESDIR}"/${P}-share.patch \ + "${FILESDIR}"/${PN}-1.3.0_rc3-conf-tests.patch + sed \ + -e 's:@HLINKS@::g' -i FL/Makefile.in || die + 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:" \ + -e "/SILENT:/d" \ + makeinclude.in || die + sed -e "s/7/$(get_version_component_range 3)/" \ + "${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake + sed -e 's:-Os::g' -i configure.in || die + eautoconf +} + +src_configure() { + econf \ + --includedir=${INCDIR}\ + --libdir=${LIBDIR} \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --enable-largefile \ + --enable-shared \ + --enable-xdbe \ + --disable-localjpeg \ + --disable-localpng \ + --disable-localzlib \ + $(use_enable debug) \ + $(use_enable cairo) \ + $(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 html || die "emake doc failed" + if use pdf; then + emake pdf || die "emake doc failed" + fi + 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 || die + + 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 + echo + ewarn "PLEASE PLEASE take note of this" + ewarn "Please make *sure* to run revdep-rebuild now" + ewarn "You must recompile everything that depend on fltk!" + echo +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} |