Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 96894 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/x11-misc/xscreensaver/xscreensaver-4.21.ebuild (-19 / +27 lines)
Lines 1-12 Link Here
1
# Copyright 1999-2005 Gentoo Foundation
1
# Copyright 1999-2005 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.21.ebuild,v 1.1 2005/05/27 21:26:07 rizzo Exp $
3
# $Header: $
4
4
5
inherit eutils flag-o-matic pam
5
inherit eutils flag-o-matic pam
6
6
7
IUSE="pam kerberos krb4 gtk gnome opengl jpeg xinerama offensive motif"
7
IUSE="gnome gtk jpeg kerberos krb4 motif offensive opengl pam xinerama"
8
8
9
DESCRIPTION="a modular screensaver for X11"
9
DESCRIPTION="A modular screen saver and locker for the X Window System"
10
SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
10
SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
11
HOMEPAGE="http://www.jwz.org/xscreensaver/"
11
HOMEPAGE="http://www.jwz.org/xscreensaver/"
12
12
Lines 26-32 Link Here
26
		>=x11-libs/gtk+-2
26
		>=x11-libs/gtk+-2
27
		>=gnome-base/libglade-1.99
27
		>=gnome-base/libglade-1.99
28
		>=dev-libs/glib-2
28
		>=dev-libs/glib-2
29
		gnome? ( >=gnome-extra/yelp-2 )
30
	)
29
	)
31
	motif? ( x11-libs/openmotif )
30
	motif? ( x11-libs/openmotif )
32
	pam? ( virtual/pam )
31
	pam? ( virtual/pam )
Lines 34-40 Link Here
34
	jpeg? ( media-libs/jpeg )
33
	jpeg? ( media-libs/jpeg )
35
	opengl? ( virtual/opengl
34
	opengl? ( virtual/opengl
36
	          >=media-libs/gle-3.0.1 )"
35
	          >=media-libs/gle-3.0.1 )"
37
		#gnome? ( >=gnome-extra/yelp-2 gnome-base/gdm )
36
		#gnome? ( gnome-base/gdm )
38
37
39
DEPEND="${RDEPEND}
38
DEPEND="${RDEPEND}
40
	sys-devel/bc
39
	sys-devel/bc
Lines 50-62 Link Here
50
pkg_setup() {
49
pkg_setup() {
51
	if ! use gtk ; then
50
	if ! use gtk ; then
52
		if use motif ; then
51
		if use motif ; then
53
			ewarn 'From the configure script:'
52
			ewarn "From the configure script:"
54
			ewarn '  Though the Motif front-end to xscreensaver is still'
53
			ewarn
55
			ewarn '  maintained, it is no longer being updated with new'
54
			ewarn "  Though the Motif front-end to xscreensaver is still"
56
			ewarn '  features: all new development on the xscreensaver-demo'
55
			ewarn "  maintained, it is no longer being updated with new"
57
			ewarn '  program is happening in the GTK version, and not in the'
56
			ewarn "  features: all new development on the xscreensaver-demo"
58
			ewarn '  Motif version.'
57
			ewarn "  program is happening in the GTK version, and not in the"
59
			ewarn 'It is recommended that you use the "gtk" USE flag.'
58
			ewarn "  Motif version."
59
			ewarn
60
			ewarn "It is recommended that you use the \"gtk\" USE flag."
60
		else
61
		else
61
			ewarn "You have enabled neither gtk nor motif USE flags.  xscreensaver-demo"
62
			ewarn "You have enabled neither gtk nor motif USE flags.  xscreensaver-demo"
62
			ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
63
			ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
Lines 70-76 Link Here
70
		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
71
		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
71
		ewarn "disabled unless kerberos 4 support has been compiled with your"
72
		ewarn "disabled unless kerberos 4 support has been compiled with your"
72
		ewarn "kerberos libraries. To do that, you should abort now and do:"
73
		ewarn "kerberos libraries. To do that, you should abort now and do:"
73
		ewarn ""
74
		ewarn
74
		ewarn " USE=\"krb4\" emerge mit-krb5"
75
		ewarn " USE=\"krb4\" emerge mit-krb5"
75
		ewarn
76
		ewarn
76
		epause
77
		epause
Lines 82-90 Link Here
82
83
83
	cd ${S}
84
	cd ${S}
84
	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
85
	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
85
	epatch ${FILESDIR}/${PN}-4.21-norpm.patch
86
	# use gnome-terminal in tests rather than gnome-open (bug #94708)
87
	epatch ${FILESDIR}/${PN}-4.22-configure.patch
86
	# tweaks the default configuration (driver/XScreenSaver.ad.in)
88
	# tweaks the default configuration (driver/XScreenSaver.ad.in)
87
	epatch ${FILESDIR}/${PN}-4.21-settings.patch
89
	epatch ${FILESDIR}/${PN}-4.22-settings.patch
90
	# fixes wrong argument for inter-aggregate screensaver
91
	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
88
	# disable not-safe-for-work xscreensavers
92
	# disable not-safe-for-work xscreensavers
89
	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
93
	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
90
}
94
}
Lines 109-118 Link Here
109
		|| myconf="${myconf} --without-kerberos"
113
		|| myconf="${myconf} --without-kerberos"
110
114
111
	econf \
115
	econf \
112
		--with-hackdir=/usr/lib/xscreensaver \
116
		--with-hackdir=/usr/lib/misc/xscreensaver \
113
		--with-configdir=/usr/share/xscreensaver/config \
117
		--with-configdir=/usr/share/xscreensaver/config \
114
		--x-libraries=/usr/X11R6/lib \
118
		--x-libraries=/usr/$(get_libdir) \
115
		--x-includes=/usr/X11R6/include \
119
		--x-includes=/usr/include \
116
		--with-mit-ext \
120
		--with-mit-ext \
117
		--with-dpms-ext \
121
		--with-dpms-ext \
118
		--with-xf86vmode-ext \
122
		--with-xf86vmode-ext \
Lines 124-129 Link Here
124
		--enable-locking \
128
		--enable-locking \
125
		$(use_with xinerama xinerama-ext) \
129
		$(use_with xinerama xinerama-ext) \
126
		$(use_with pam) \
130
		$(use_with pam) \
131
		$(use_with pam pam-service-name=xscreensaver) \
127
		$(use_with opengl gl) $(use_with opengl gle) \
132
		$(use_with opengl gl) $(use_with opengl gle) \
128
		$(use_with jpeg) \
133
		$(use_with jpeg) \
129
		$(use_enable nls) \
134
		$(use_enable nls) \
Lines 137-143 Link Here
137
142
138
	make install_prefix="${D}" install || die
143
	make install_prefix="${D}" install || die
139
144
145
	use pam && fperms 755 /usr/bin/xscreensaver
146
140
	dodoc README
147
	dodoc README
148
	cp ${FILESDIR}/gentoo-philosophy ${D}/usr/share/${PN}
141
149
142
	# install correctly in gnome2
150
	# install correctly in gnome2
143
	if use gnome ; then
151
	if use gnome ; then
Lines 147-153 Link Here
147
	fi
155
	fi
148
156
149
	# install symlink to satisfy kde
157
	# install symlink to satisfy kde
150
	use kde && dosym /usr/share/xscreensaver/config /usr/lib/xscreensaver/config
158
	use kde && dosym /usr/share/xscreensaver/config /usr/$(get_libdir)/xscreensaver/config
151
159
152
	# Remove "extra" capplet
160
	# Remove "extra" capplet
153
	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
161
	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop

Return to bug 96894