Attachment #452382 for bug #598830




}

src_configure() {
	local imagepath
	imagepath+="--with-imagepath="
	imagepath+="${EPREFIX}/usr/include/X11/bitmaps"
	imagepath+=":${EPREFIX}/usr/include/X11/pixmaps"
	imagepath+=":${EPREFIX}/usr/share/icons/fvwm"

	declare -a myconf
	myconf=("--docdir=${EPREFIX}/usr/doc/${P}"
		"$imagepath"
		"--enable-package-subdirs"
		"--without-gnome"
		)

	# Non-upstream email where bugs should be sent; used in fvwm-bug.
	export FVWM_BUGADDR="desktop-wm@gentoo.org"

	# Signed chars are required.
	use ppc && append-flags -fsigned-char

	myconf+=("--disable-gtk")

	use readline && myconf+=("--without-termcap-library")

	econf "${myconf[@]}" \
		$(use_enable bidi) \
		$(use_enable debug debug-msgs) \
		$(use_enable debug command-log) \

		$(use_with stroke stroke-library) \
		$(use_enable svg rsvg) \
		$(use_enable truetype xft) \
		$(use_enable xinerama)
		--docdir="/usr/share/doc/${P}"
}

src_install() {
	emake DESTDIR="${D}" install

	# These are always removed, because gentoo doesn't have anymore
	# a dev-perl/gtk-perl package, so, these modules are pointless.
	rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
	find "${ED}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null

	if ! use lock; then
		find "${ED}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
	fi

	if use perl; then
		if ! use tk; then
			rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
			if ! use gtk2-perl; then # no tk and no gtk2 bindings
				rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
				find "${ED}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
			fi
		fi

		# 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 "${ED}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
		fi
	else
		# Completely wipe it if ! use perl
		rm -rf "${ED}/usr/bin/fvwm-perllib" \
			"${ED}/usr/share/man/man1/fvwm-perllib.1"
	fi

	# Utility for testing FVWM behaviour by creating a simple window with

		newdoc "${S}/tests/hints/README" README.hints
	fi

	dodir "/etc/X11/Sessions"
	echo "${EPREFIX}/usr/bin/fvwm" > "${ED}/etc/X11/Sessions/${PN}" || die
	fperms a+x "/etc/X11/Sessions/${PN}" || die

	dodoc AUTHORS ChangeLog NEWS README \
		docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \

Return to bug 598830

Lines 83-89 Link Here

(-)/home/vidagabor/usr/roots/gentoo/usr/portage/x11-wm/fvwm/fvwm-2.6.5-r1.ebuild (-19 / +29 lines)
83	}	83	}
84		84
85	src_configure() {	85	src_configure() {
86	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"	86	local imagepath
		87	imagepath+="--with-imagepath="
		88	imagepath+="${EPREFIX}/usr/include/X11/bitmaps"
		89	imagepath+=":${EPREFIX}/usr/include/X11/pixmaps"
		90	imagepath+=":${EPREFIX}/usr/share/icons/fvwm"
		91
		92	declare -a myconf
		93	myconf=("--docdir=${EPREFIX}/usr/doc/${P}"
		94	"$imagepath"
		95	"--enable-package-subdirs"
		96	"--without-gnome"
		97	)
87		98
88	# Non-upstream email where bugs should be sent; used in fvwm-bug.	99	# Non-upstream email where bugs should be sent; used in fvwm-bug.
89	export FVWM_BUGADDR="desktop-wm@gentoo.org"	100	export FVWM_BUGADDR="desktop-wm@gentoo.org"
Lines 94-104 Link Here
94	# Signed chars are required.	105	# Signed chars are required.
95	use ppc && append-flags -fsigned-char	106	use ppc && append-flags -fsigned-char
96		107
97	myconf="${myconf} --disable-gtk"	108	myconf+=("--disable-gtk")
98		109
99	use readline && myconf="${myconf} --without-termcap-library"	110	use readline && myconf+=("--without-termcap-library")
100		111
101	econf ${myconf} \	112	econf "${myconf[@]}" \
102	$(use_enable bidi) \	113	$(use_enable bidi) \
103	$(use_enable debug debug-msgs) \	114	$(use_enable debug debug-msgs) \
104	$(use_enable debug command-log) \	115	$(use_enable debug command-log) \
Lines 112-151 Link Here
112	$(use_with stroke stroke-library) \	123	$(use_with stroke stroke-library) \
113	$(use_enable svg rsvg) \	124	$(use_enable svg rsvg) \
114	$(use_enable truetype xft) \	125	$(use_enable truetype xft) \
115	$(use_enable xinerama) \	126	$(use_enable xinerama)
116	--docdir="/usr/share/doc/${P}"
117	}	127	}
118		128
119	src_install() {	129	src_install() {
120	emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install	130	emake DESTDIR="${D}" install
121		131
122	# These are always removed, because gentoo doesn't have anymore	132	# These are always removed, because gentoo doesn't have anymore
123	# a dev-perl/gtk-perl package, so, these modules are pointless.	133	# a dev-perl/gtk-perl package, so, these modules are pointless.
124	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"	134	rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
125	find "${D}" -name 'FvwmGtkDebug' -exec rm -f '{}' \; 2>/dev/null	135	find "${ED}" -name 'FvwmGtkDebug' -exec rm -f '{}' \; 2>/dev/null
126		136
127	if ! use lock; then	137	if ! use lock; then
128	find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null	138	find "${ED}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
129	fi	139	fi
130		140
131	if use perl; then	141	if use perl; then
132	if ! use tk; then	142	if ! use tk; then
133	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"	143	rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
134	if ! use gtk2-perl; then # no tk and no gtk2 bindings	144	if ! use gtk2-perl; then # no tk and no gtk2 bindings
135	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"	145	rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
136	find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null	146	find "${ED}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
137	fi	147	fi
138	fi	148	fi
139		149
140	# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl	150	# Now, the Gtk2.pm file, it will require dev-perl/gtk2-perl
141	# so it implies gtk2 as well. That's why we need another use flag.	151	# so it implies gtk2 as well. That's why we need another use flag.
142	if ! use gtk2-perl; then	152	if ! use gtk2-perl; then
143	rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"	153	rm -f "${ED}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
144	fi	154	fi
145	else	155	else
146	# Completely wipe it if ! use perl	156	# Completely wipe it if ! use perl
147	rm -rf "${D}/usr/bin/fvwm-perllib" \	157	rm -rf "${ED}/usr/bin/fvwm-perllib" \
148	"${D}/usr/share/man/man1/fvwm-perllib.1"	158	"${ED}/usr/share/man/man1/fvwm-perllib.1"
149	fi	159	fi
150		160
151	# Utility for testing FVWM behaviour by creating a simple window with	161	# Utility for testing FVWM behaviour by creating a simple window with
Lines 155-163 Link Here
155	newdoc "${S}/tests/hints/README" README.hints	165	newdoc "${S}/tests/hints/README" README.hints
156	fi	166	fi
157		167
158	# dodir /etc/X11/Sessions	168	dodir "/etc/X11/Sessions"
159	# echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" \|\| die	169	echo "${EPREFIX}/usr/bin/fvwm" > "${ED}/etc/X11/Sessions/${PN}" \|\| die
160	# fperms a+x /etc/X11/Sessions/${PN} \|\| die	170	fperms a+x "/etc/X11/Sessions/${PN}" \|\| die
161		171
162	dodoc AUTHORS ChangeLog NEWS README \	172	dodoc AUTHORS ChangeLog NEWS README \
163	docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \	173	docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \