diff options
author | 2008-05-08 01:49:36 +0000 | |
---|---|---|
committer | 2008-05-08 01:49:36 +0000 | |
commit | bcaf0dd7fdf8a45e0d788a3368ad228e39cc2961 (patch) | |
tree | dcec3a45aa6340b179c6022bb739b16b03265a93 | |
parent | version bump to 2.5.26 (diff) | |
download | omp-bcaf0dd7fdf8a45e0d788a3368ad228e39cc2961.tar.gz omp-bcaf0dd7fdf8a45e0d788a3368ad228e39cc2961.tar.bz2 omp-bcaf0dd7fdf8a45e0d788a3368ad228e39cc2961.zip |
lots of fixes, r/depends and perl/gtk stuff
svn path=/; revision=17
-rw-r--r-- | x11-wm/fvwm/Manifest | 2 | ||||
-rw-r--r-- | x11-wm/fvwm/fvwm-2.5.26.ebuild | 81 |
2 files changed, 50 insertions, 33 deletions
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 803cf36..2211e5f 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -7,5 +7,5 @@ DIST fvwm-2.5.25.tar.bz2 2516717 RMD160 bf77786a071838304eb4bf8cc14960196c235506 DIST fvwm-2.5.26.tar.bz2 2509177 RMD160 47be927e61ef5411b668baec0e9a00d5691b3784 SHA1 26d9054c0f148a397eeaa9939be9329fb002831f SHA256 84aca15165f600c5c09095c94b3ad1f0bfe16ba25cf2097f76312a0fba89251d DIST fvwm-patchset-20070901-r2.tar.bz2 37255 RMD160 787fe6f49e497a225648dbdd30b0636d3416a5b0 SHA1 9d56b1f2703feb52987e6aeb22dc151bc0e10d67 SHA256 9342142d216ca5b89c161a9796a08c4effc1b3d8dd41090e3419b051fac639fa EBUILD fvwm-2.5.25.ebuild 4422 RMD160 d052e5cbc8e6de455d6dc7fde785d6ad0de42017 SHA1 6d93b42cc8d23dda028fc329e24bfd91778e198d SHA256 c1c0fb5601d2c5b6852e2da903eeb1eb680af59e3e10458d74303db00b393450 -EBUILD fvwm-2.5.26.ebuild 4422 RMD160 d052e5cbc8e6de455d6dc7fde785d6ad0de42017 SHA1 6d93b42cc8d23dda028fc329e24bfd91778e198d SHA256 c1c0fb5601d2c5b6852e2da903eeb1eb680af59e3e10458d74303db00b393450 +EBUILD fvwm-2.5.26.ebuild 4830 RMD160 c285b4a6cdbc6da9017018732252a4dc41048d94 SHA1 96dfa3f94cebe88fbf7140c7791578d6530a0fa2 SHA256 5d26f6a7955ad8256b32f54b8a085e44e35e844bb2945c7a05476508f5aa630e EBUILD fvwm-9999.ebuild 6985 RMD160 fadfaa9ca384911f2a5930991a494c7ea80754ca SHA1 60c6c84d287b3c6c4fa2249bc8b7e1c816f8d0f2 SHA256 b7a725d6bd63582a89cfde414263acdf9b2c1709180039fce96d2273176e63a2 diff --git a/x11-wm/fvwm/fvwm-2.5.26.ebuild b/x11-wm/fvwm/fvwm-2.5.26.ebuild index 9b68653..b353f17 100644 --- a/x11-wm/fvwm/fvwm-2.5.26.ebuild +++ b/x11-wm/fvwm/fvwm-2.5.26.ebuild @@ -11,48 +11,62 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2" LICENSE="GPL-2 FVWM" SLOT="0" KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="bidi debug doc gtk imlib nls perl png readline rplay stroke svg tk truetype vanilla xinerama" +IUSE="bidi debug doc gtk gtk2-perl imlib netpbm nls perl png readline rplay stroke svg tk truetype vanilla xinerama" RDEPEND="dev-lang/perl - sys-libs/zlib - x11-libs/libXpm - x11-libs/libXft bidi? ( dev-libs/fribidi ) - gtk? ( - =x11-libs/gtk+-1.2* - imlib? ( media-libs/imlib ) + gtk2-perl? ( + dev-perl/gtk2-perl ) + netpbm? ( media-libs/netpbm ) perl? ( tk? ( dev-lang/tk dev-perl/perl-tk >=dev-perl/X11-Protocol-0.56 ) ) + rplay? ( media-sound/rplay ) + userland_GNU? ( sys-apps/debianutils )" + +DEPEND="${RDEPEND} + dev-libs/libxslt + dev-libs/libxml2 + dev-util/pkgconfig + sys-libs/zlib + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + x11-proto/xextproto + x11-proto/xproto + doc? ( dev-libs/libxslt ) + gtk? ( + =x11-libs/gtk+-1.2* + imlib? ( media-libs/imlib ) + ) png? ( media-libs/libpng ) readline? ( sys-libs/ncurses sys-libs/readline ) - rplay? ( media-sound/rplay ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig virtual/xft ) - userland_GNU? ( sys-apps/debianutils ) - xinerama? ( x11-libs/libXinerama )" -# XXX: gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency? -# XXX: gtk perl bindings require dev-perl/gtk-perl, worth a dependency? -# XXX: netpbm is used by FvwmScript-ScreenDump, worth a dependency? -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/pkgconfig - x11-libs/libXrandr - x11-proto/xextproto - x11-proto/xproto - doc? ( dev-libs/libxslt ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( + x11-proto/xineramaproto + x11-libs/libXinerama + )" src_unpack() { unpack ${A} @@ -116,24 +130,27 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" - if use perl; then - local toolkits="gtk tcltk" + # These are always removed, because gentoo doesn't have anymore + # a dev-perl/gtk-perl package, so, these modules are pointless. + rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm" + find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null + if use perl; then if ! use tk; then rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm" - toolkits=${toolkits/tcltk/} - fi - - if ! use gtk; then - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/"Gtk{,2}.pm - toolkits=${toolkits/gtk/} + if ! use gtk2-perl; then # no tk and no gtk2 bindings + rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm" + find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null + fi fi - if ! test "${toolkits// /}"; then - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm" - find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir {} \; 2>/dev/null + # Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl + # so it implies gtk2 as well. That's why we need another use flag. + if ! use gtk2-perl; then + rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm" fi else + # Compretely wipe it if ! use perl rm -rf "${D}/usr/bin/fvwm-perllib" \ "${D}/usr/share/man/man1/fvwm-perllib.1" fi |