diff options
author | Raúl Porcel <armin76@gentoo.org> | 2006-11-03 11:25:40 +0000 |
---|---|---|
committer | Raúl Porcel <armin76@gentoo.org> | 2006-11-03 11:25:40 +0000 |
commit | 547e0addaeb1cd975c820736337722cbefd07a9a (patch) | |
tree | 3c0afb7363b5fe5309419be44ea1fa41e1e7184b | |
parent | sys-fs/fuseiso: drop old (diff) | |
download | sunrise-547e0addaeb1cd975c820736337722cbefd07a9a.tar.gz sunrise-547e0addaeb1cd975c820736337722cbefd07a9a.tar.bz2 sunrise-547e0addaeb1cd975c820736337722cbefd07a9a.zip |
x11-misc/slim: drop old
svn path=/sunrise/; revision=1797
-rw-r--r-- | x11-misc/slim/ChangeLog | 4 | ||||
-rw-r--r-- | x11-misc/slim/Manifest | 19 | ||||
-rw-r--r-- | x11-misc/slim/files/digest-slim-1.2.5 | 3 | ||||
-rw-r--r-- | x11-misc/slim/files/slim-cflags.patch | 36 | ||||
-rw-r--r-- | x11-misc/slim/slim-1.2.5.ebuild | 63 |
5 files changed, 8 insertions, 117 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 567a1c3fe..6e2a2c803 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Nov 2006; Raul Porcel (armin76) <armin76@gmail.com> -slim-1.2.5.ebuild, + -files/slim-cflags.patch: + drop old + 18 Aug 2006; Jakub Moc <jakub@gentoo.org> -slim-1.2.5-r1.ebuild, +slim-1.2.5-r2.ebuild, files/slim-fix-warnings.patch: Revbump to fix the warnings patch diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest index 01b99d86a..d4b28a0cf 100644 --- a/x11-misc/slim/Manifest +++ b/x11-misc/slim/Manifest @@ -1,7 +1,3 @@ -AUX slim-cflags.patch 1323 RMD160 994a329f1c3b2b79ab09fa9eca6f741ee2c9e253 SHA1 1adef5d29156ccbd304ac21ec5ff22a31ae58fda SHA256 937852de4141ccf54834bf2bf9f13584a0466a647f21fbf43b67989c51f03f27 -MD5 73c0aef8cda4201853c02ee4c49dd4f0 files/slim-cflags.patch 1323 -RMD160 994a329f1c3b2b79ab09fa9eca6f741ee2c9e253 files/slim-cflags.patch 1323 -SHA256 937852de4141ccf54834bf2bf9f13584a0466a647f21fbf43b67989c51f03f27 files/slim-cflags.patch 1323 AUX slim-fix-warnings.patch 3022 RMD160 44fc8cd074be520ba3ef282884b33b4a7e25f193 SHA1 594ba1d328a9c6207290108003458b9fc8ea0b6c SHA256 5d79a0738d22b9480913914c8462eb99251efa11c6a5d7aed30b15e741e5fdb8 MD5 7ff70ebcb464c6648385ba7b1e294c52 files/slim-fix-warnings.patch 3022 RMD160 44fc8cd074be520ba3ef282884b33b4a7e25f193 files/slim-fix-warnings.patch 3022 @@ -11,21 +7,14 @@ EBUILD slim-1.2.5-r2.ebuild 1799 RMD160 838a3faa7538dc5149709335196fc195c82fdabe MD5 775448ab8b21a822182b5e18d22fc318 slim-1.2.5-r2.ebuild 1799 RMD160 838a3faa7538dc5149709335196fc195c82fdabe slim-1.2.5-r2.ebuild 1799 SHA256 4066d9e451c362f046f205c345d5ca9182b8f9ee7dfafe140b618e542d0e1a79 slim-1.2.5-r2.ebuild 1799 -EBUILD slim-1.2.5.ebuild 1813 RMD160 18056be2ae0fb9320f1f027c98bca5afa948e7d4 SHA1 051e6bc4697a51328ccb07ab001cbf92f9c7e2bd SHA256 b89de26c00cf1847c8634198f241a4a7b8276dfdc51f51e79cf9f1a3734afaab -MD5 8111824448486cdbe15027ff4820d2be slim-1.2.5.ebuild 1813 -RMD160 18056be2ae0fb9320f1f027c98bca5afa948e7d4 slim-1.2.5.ebuild 1813 -SHA256 b89de26c00cf1847c8634198f241a4a7b8276dfdc51f51e79cf9f1a3734afaab slim-1.2.5.ebuild 1813 -MISC ChangeLog 749 RMD160 4fd7d9f6b730eeb2a55880caabed87dd0832e110 SHA1 84a1d59b053528f590586cc74e1db751e4dd0287 SHA256 eabbfa66daad35793b59edccd7ccf2d4e6021b3fd56152181905b2ad76336b8d -MD5 b51b2c34b115339ad09f4562329f2302 ChangeLog 749 -RMD160 4fd7d9f6b730eeb2a55880caabed87dd0832e110 ChangeLog 749 -SHA256 eabbfa66daad35793b59edccd7ccf2d4e6021b3fd56152181905b2ad76336b8d ChangeLog 749 +MISC ChangeLog 866 RMD160 c2abd5656c91951b0f2c8f2d50906a668a83eb69 SHA1 d904ad2c9cc0f88d3720c1a38d21407a96178d01 SHA256 6f0e685b3878973b6c6b7cf709986498972bfd2356a33f43e37a71a58488472e +MD5 2cca6c73ab42b0bd34a62fc819f3460d ChangeLog 866 +RMD160 c2abd5656c91951b0f2c8f2d50906a668a83eb69 ChangeLog 866 +SHA256 6f0e685b3878973b6c6b7cf709986498972bfd2356a33f43e37a71a58488472e ChangeLog 866 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 e087ddd8c788afb3d12d7de0306d96d0 files/digest-slim-1.2.5 232 -RMD160 16e6b4762e059ecea287807933d8fd48551390b6 files/digest-slim-1.2.5 232 -SHA256 94cbe9129d5e576e8e1e3a54e40356e70cae9d798a01a203f626b8c801d06c0e files/digest-slim-1.2.5 232 MD5 e087ddd8c788afb3d12d7de0306d96d0 files/digest-slim-1.2.5-r2 232 RMD160 16e6b4762e059ecea287807933d8fd48551390b6 files/digest-slim-1.2.5-r2 232 SHA256 94cbe9129d5e576e8e1e3a54e40356e70cae9d798a01a203f626b8c801d06c0e files/digest-slim-1.2.5-r2 232 diff --git a/x11-misc/slim/files/digest-slim-1.2.5 b/x11-misc/slim/files/digest-slim-1.2.5 deleted file mode 100644 index 6689f6993..000000000 --- a/x11-misc/slim/files/digest-slim-1.2.5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 faa644d874abba2f02bdce7d90539f57 slim-1.2.5.tar.gz 216437 -RMD160 796dc2cf2f903a5d1d7e8aa92106bd9af7990d69 slim-1.2.5.tar.gz 216437 -SHA256 eee5c172a3397a2edc279d6a7a46c0075e05c022c4cb4417a14e3714626c9261 slim-1.2.5.tar.gz 216437 diff --git a/x11-misc/slim/files/slim-cflags.patch b/x11-misc/slim/files/slim-cflags.patch deleted file mode 100644 index baec16136..000000000 --- a/x11-misc/slim/files/slim-cflags.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.orig 2006-07-24 18:40:12.000000000 +0200 -+++ Makefile 2006-08-07 14:30:36.000000000 +0200 -@@ -5,13 +5,12 @@ - ####################################################### - CXX=/usr/bin/g++ - CC=/usr/bin/gcc --CFLAGS=-I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include --CXXLAGS=$(CFLAGS) --LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg -+INCLUDES=-I. -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -+MYLDFLAGS=-lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXpm -lXmu -lpng -ljpeg - CUSTOM=-DHAVE_SHADOW - PREFIX=/usr - CFGDIR=/etc --MANDIR=/usr/man -+MANDIR=/usr/share/man - DESTDIR= - ####################################################### - -@@ -26,13 +25,13 @@ - all: slim - - slim: $(OBJECTS) -- $(CXX) $(LDFLAGS) $(OBJECTS) -o $(NAME) -+ $(CXX) $(LDFLAGS) $(MYLDFLAGS) $(OBJECTS) -o $(NAME) - - .cpp.o: -- $(CXX) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ -+ $(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@ - - .c.o: -- $(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@ -+ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CUSTOM) -c $< -o $@ - - install: slim install-theme - install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim diff --git a/x11-misc/slim/slim-1.2.5.ebuild b/x11-misc/slim/slim-1.2.5.ebuild deleted file mode 100644 index ca1782819..000000000 --- a/x11-misc/slim/slim-1.2.5.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils toolchain-funcs - -DESCRIPTION="SLiM - Simple Login Manager" -HOMEPAGE="http://slim.berlios.de/" -SRC_URI="http://download.berlios.de/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="|| ( ( x11-proto/xproto - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXft ) - <virtual/x11-7 - ) - media-libs/libpng - media-libs/jpeg" -RDEPEND="${DEPEND} - media-fonts/corefonts" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-cflags.patch - sed -i -e "s:/usr/bin/g++:$(tc-getCXX):" \ - -e "s:/usr/bin/gcc:$(tc-getCC):" \ - Makefile || die 'sed failed in Makefile' - - # Remove all X11R6 references from slim.conf - # Set slim to daemon mode as default to stop xdm runscript from throwing errors on stop - # Set the default logfile to /dev/null to avoid cluttering up the harddisk - # as slim puts a lot of garbage in its logfile - sed -i -e 's#X11R6/##g' -e 's#/usr/bin:##' \ - -e 's/# daemon/daemon/' \ - -e 's#/var/log/slim.log#/dev/null#g' \ - slim.conf || die "sed slim.conf failed" -} - -src_compile() { - emake CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc xinitrc.sample README TODO THEMES -} - -pkg_postinst() { - elog "The configuration file is located at /etc/slim.conf." - elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " - elog "in /etc/rc.conf and run \"rc-update add xdm default\" " - elog - elog "${PN} uses .xinitrc in the user's home directory and /etc/slim.conf" - elog "for session management. For further information, see README and" - elog "xinitrc.sample in /usr/share/doc/${PF}" -} |