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

Collapse All | Expand All

(-)cinnamon-1.6.7-r1.ebuild (-4 / +4 lines)
Lines 125-131 Link Here
125
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
125
# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
126
# https://bugs.gentoo.org/show_bug.cgi?id=360413
126
# https://bugs.gentoo.org/show_bug.cgi?id=360413
127
127
128
S="${WORKDIR}/linuxmint-Cinnamon-5ab432d"
128
S="${WORKDIR}/linuxmint-Cinnamon-ded6f27"
129
129
130
pkg_setup() {
130
pkg_setup() {
131
	python-single-r1_pkg_setup
131
	python-single-r1_pkg_setup
Lines 136-142 Link Here
136
	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
136
	epatch "${FILESDIR}/${PN}-1.6.1-automagic-gnome-bluetooth.patch"
137
137
138
	# Make networkmanager optional, bug #398593
138
	# Make networkmanager optional, bug #398593
139
	epatch "${FILESDIR}/${PN}-1.6.1-optional-networkmanager.patch"
139
	epatch "${FILESDIR}/${P}-optional-networkmanager.patch"
140
140
141
	# Gentoo uses /usr/libexec
141
	# Gentoo uses /usr/libexec
142
	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
142
	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
Lines 147-154 Link Here
147
		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
147
		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
148
		-i files/usr/bin/cinnamon-menu-editor \
148
		-i files/usr/bin/cinnamon-menu-editor \
149
		-i files/usr/bin/cinnamon-settings \
149
		-i files/usr/bin/cinnamon-settings \
150
		-i files/usr/lib/cinnamon-menu-editor/Alacarte/config.py \
150
		-i files/usr/lib/cinnamon-menu-editor/cme/config.py \
151
		-i files/usr/lib/cinnamon-menu-editor/Alacarte/MainWindow.py \
151
		-i files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py \
152
		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py || die "sed 2 failed"
152
		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py || die "sed 2 failed"
153
	if [[ "$(get_libdir)" != lib ]]; then
153
	if [[ "$(get_libdir)" != lib ]]; then
154
		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
154
		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"

Return to bug 470248