From 054a1b18d577823378219dbacac694036bb940f4 Mon Sep 17 00:00:00 2001 From: "D.M.D. Ljungmark" Date: Wed, 22 May 2002 18:33:54 +0000 Subject: change rep-gtk dep from dev-libs to x11-libs --- x11-wm/sawfish-merlin/ChangeLog | 11 ++- .../files/digest-sawfish-merlin-1.0.1-r1 | 1 - .../files/digest-sawfish-merlin-1.0.1-r2 | 1 + .../sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild | 85 ---------------------- .../sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild | 85 ++++++++++++++++++++++ 5 files changed, 96 insertions(+), 87 deletions(-) delete mode 100644 x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1 create mode 100644 x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r2 delete mode 100644 x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild create mode 100644 x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild diff --git a/x11-wm/sawfish-merlin/ChangeLog b/x11-wm/sawfish-merlin/ChangeLog index 95acd1c18d8f..cf0d95f3e4fd 100644 --- a/x11-wm/sawfish-merlin/ChangeLog +++ b/x11-wm/sawfish-merlin/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-wm/sawfish # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/ChangeLog,v 1.2 2002/04/07 15:28:17 gbevin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/ChangeLog,v 1.3 2002/05/22 18:33:54 spider Exp $ + +*sawfish-merlin-1.0.1-r2 (22 May 2002) + 22 May 2002; Spider ChangeLog sawfish-merlin-1.0.1-r2.ebuild + Fix changelog + fix rep-gtk dependency from dev-libs to x11-libs + +sawfish-merlin-1.0.1-r1 (09 Apr 2002) + 09 Apr 2002; Spider : + Fix >=x11-lib/gtk+-1.2.nn to =x11-lib/gtk+-1.2* *sawfish-merlin-1.0.1-r1 (07 Apr 2002) diff --git a/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1 b/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1 deleted file mode 100644 index 3592e2b26ab4..000000000000 --- a/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1326727 diff --git a/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r2 b/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r2 new file mode 100644 index 000000000000..3592e2b26ab4 --- /dev/null +++ b/x11-wm/sawfish-merlin/files/digest-sawfish-merlin-1.0.1-r2 @@ -0,0 +1 @@ +MD5 b1587ea76cca08ec951f2536c17a307e sawfish-1.0.1.tar.gz 1326727 diff --git a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild deleted file mode 100644 index eae8f9fbb9c3..000000000000 --- a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2001 theLeaf sprl/bvba -# Author Geert Bevin -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r1.ebuild,v 1.2 2002/04/28 04:15:49 seemant Exp $ - -MY_P=${P/-merlin/} -S=${WORKDIR}/${MY_P} -DESCRIPTION="Extensions for sawfish which provide pages, iconbox and other nice things." -SRC_URI="http://prdownloads.sourceforge.net/sawmill/${MY_P}.tar.gz" -HOMEPAGE="http://www.merlin.org/sawfish" - -DEPEND=">=dev-libs/rep-gtk-0.15-r1 - >=dev-libs/librep-0.14 - >=media-libs/imlib-1.9.10-r1 - esd? ( >=media-sound/esound-0.2.22 ) - gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 ) - gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 - >=media-libs/gdk-pixbuf-0.11.0-r1 )" - -RDEPEND="${DEPEND} - >=x11-libs/gtk+-1.2.10-r4 - nls? ( sys-devel/gettext )" - -src_unpack() { - - unpack ${A} - - cd ${S} - patch -p0 <${FILESDIR}/capplet-crash.patch || die - #fix buggy Makefile with newer libtool - patch -p0 <${FILESDIR}/sawfish-${PV}-exec.patch || die - - cd ${S}/po - cd ${S}/src - patch -p1 < ${FILESDIR}/x.c.patch-merlin-1.0.2 || die - - #update libtool for "relink" bug fix - libtoolize --copy --force - aclocal -} - - -src_compile() { - - local myconf - - use esd \ - && myconf="--with-esd" \ - || myconf="--without-esd" - - use gnome \ - && myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet" \ - || myconf="${myconf} --disable-gnome-widgets --disable-capplet" - - use nls || myconf="${myconf} --disable-linguas" - - use gtk || use gnome \ - && myconf="${myconf} --with-gdk-pixbuf" \ - || myconf="${myconf} --without-gdk-pixbuf" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --libexecdir=/usr/lib \ - --with-audiofile \ - ${myconf} || die - - emake || die -} - -src_install() { - mkdir -p ${D}/usr/lib/sawfish/${PV}/sawfish-merlin/sawfish/wm/util - cp src/.libs/x.* ${D}/usr/lib/sawfish/${PV}/sawfish-merlin - cp src/.libs/x.* ${D}/usr/lib/sawfish/${PV}/sawfish-merlin/sawfish/wm/util - - dodir /etc/X11/gdm/Sessions/ - exeinto /etc/X11/gdm/Sessions/ - newexe ${FILESDIR}/gdm_session Sawfish - - dodir /etc/skel - insinto /etc/skel - cp -a ${FILESDIR}/sawfish ${D}/etc/skel/.sawfish - find ${D}/etc/skel/.sawfish -name "CVS" -exec rm -rf '{}' ';' - cp -a ${FILESDIR}/sawfishrc ${D}/etc/skel/.sawfishrc -} diff --git a/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild new file mode 100644 index 000000000000..77a25bf7b850 --- /dev/null +++ b/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 2001 theLeaf sprl/bvba +# Author Geert Bevin +# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish-merlin/sawfish-merlin-1.0.1-r2.ebuild,v 1.1 2002/05/22 18:33:54 spider Exp $ + +MY_P=${P/-merlin/} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Extensions for sawfish which provide pages, iconbox and other nice things." +SRC_URI="http://prdownloads.sourceforge.net/sawmill/${MY_P}.tar.gz" +HOMEPAGE="http://www.merlin.org/sawfish" + +DEPEND=">=x11-libs/rep-gtk-0.15-r1 + >=dev-libs/librep-0.14 + >=media-libs/imlib-1.9.10-r1 + esd? ( >=media-sound/esound-0.2.22 ) + gtk? ( >=media-libs/gdk-pixbuf-0.11.0-r1 ) + gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 + >=media-libs/gdk-pixbuf-0.11.0-r1 )" + +RDEPEND="${DEPEND} + =x11-libs/gtk+-1.2* + nls? ( sys-devel/gettext )" + +src_unpack() { + + unpack ${A} + + cd ${S} + patch -p0 <${FILESDIR}/capplet-crash.patch || die + #fix buggy Makefile with newer libtool + patch -p0 <${FILESDIR}/sawfish-${PV}-exec.patch || die + + cd ${S}/po + cd ${S}/src + patch -p1 < ${FILESDIR}/x.c.patch-merlin-1.0.2 || die + + #update libtool for "relink" bug fix + libtoolize --copy --force + aclocal +} + + +src_compile() { + + local myconf + + use esd \ + && myconf="--with-esd" \ + || myconf="--without-esd" + + use gnome \ + && myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet" \ + || myconf="${myconf} --disable-gnome-widgets --disable-capplet" + + use nls || myconf="${myconf} --disable-linguas" + + use gtk || use gnome \ + && myconf="${myconf} --with-gdk-pixbuf" \ + || myconf="${myconf} --without-gdk-pixbuf" + + ./configure \ + --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib \ + --with-audiofile \ + ${myconf} || die + + emake || die +} + +src_install() { + mkdir -p ${D}/usr/lib/sawfish/${PV}/sawfish-merlin/sawfish/wm/util + cp src/.libs/x.* ${D}/usr/lib/sawfish/${PV}/sawfish-merlin + cp src/.libs/x.* ${D}/usr/lib/sawfish/${PV}/sawfish-merlin/sawfish/wm/util + + dodir /etc/X11/gdm/Sessions/ + exeinto /etc/X11/gdm/Sessions/ + newexe ${FILESDIR}/gdm_session Sawfish + + dodir /etc/skel + insinto /etc/skel + cp -a ${FILESDIR}/sawfish ${D}/etc/skel/.sawfish + find ${D}/etc/skel/.sawfish -name "CVS" -exec rm -rf '{}' ';' + cp -a ${FILESDIR}/sawfishrc ${D}/etc/skel/.sawfishrc +} -- cgit v1.2.3-65-gdbad