projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 32cf617)
Use newconfd/newinitd for #174266; Properly quote variables.
authorChristian Heim <phreak@gentoo.org>
Sun, 22 Apr 2007 17:39:35 +0000 (17:39 +0000)
committerChristian Heim <phreak@gentoo.org>
Sun, 22 Apr 2007 17:39:35 +0000 (17:39 +0000)
Package-Manager: portage-2.1.2.4

media-tv/freevo/ChangeLog patch | blob | history
media-tv/freevo/Manifest patch | blob | history
media-tv/freevo/freevo-1.5.4-r2.ebuild patch | blob | history
media-tv/freevo/freevo-1.5.4.ebuild patch | blob | history
media-tv/freevo/freevo-1.6.0.ebuild patch | blob | history
media-tv/freevo/freevo-1.6.1.ebuild patch | blob | history

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 10f98c39ccc9779b7ca5706ae70dd723fb889077..c92981a7dd0bbcca6254995aaf76496ba34ac308 100644 (file)
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.44 2007/03/19 15:05:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.45 2007/04/22 17:39:35 phreak Exp $
+
+  22 Apr 2007; Christian Heim <phreak@gentoo.org> freevo-1.5.4.ebuild,
+  freevo-1.5.4-r2.ebuild, freevo-1.6.0.ebuild, freevo-1.6.1.ebuild:
+  Use newconfd/newinitd for #174266; Properly quote variables.
 
   19 Mar 2007; Marius Mauch <genone@gentoo.org> freevo-1.5.4.ebuild,
   freevo-1.5.4-r2.ebuild, freevo-1.6.0.ebuild, freevo-1.6.1.ebuild:
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 1071bbf9b66ffeabfaa390c8abf108a67867dc23..772c0d4d3a83f76750a639432521943faba3e68c 100644 (file)
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -20,26 +20,26 @@ SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070 files/xb
 DIST freevo-1.5.4.tar.gz 4425484 RMD160 a5538af486ce6926f57f40abd90a7f655137f225 SHA1 dc8611e6af2bb09bfebc56b02c9784e305160a2f SHA256 d9a7c9455a94c281acb8c5e3f0fc68e4289af7a557af413db2244a254dd48090
 DIST freevo-1.6.0.tar.gz 12996075 RMD160 99c38a99f49bac8b5bb69a30e6b2298fb6bf27f5 SHA1 570a01bb5fdc3ad47bb1f68a4c0ec8ef5ed5bccc SHA256 3204ede221f37a72c326b28d403a6b5acead084adeb6cb0ee950c7efaa441150
 DIST freevo-1.6.1.tar.gz 13024966 RMD160 814d28f9057228af659e2d386db70299f5c249be SHA1 eb3fe72edc988b57f0bf5ecf63ff2b6ceb9dd268 SHA256 8e18aa169c0b6031e6ff798403db1fcd91ecfee0c5e638e7c09ac1b04e8832e3
-EBUILD freevo-1.5.4-r2.ebuild 5656 RMD160 949e44c0309a8b8022bc2aa2573269dc59c741ad SHA1 7ccd095b0985bf3e5ab2743253e51bb716d5c9c7 SHA256 5826e5b7fcc9410e3698fd105f13c3d4be3760872cea745245da992a4dad12d1
-MD5 afc1eddc17a84e4ca5a76eb976507039 freevo-1.5.4-r2.ebuild 5656
-RMD160 949e44c0309a8b8022bc2aa2573269dc59c741ad freevo-1.5.4-r2.ebuild 5656
-SHA256 5826e5b7fcc9410e3698fd105f13c3d4be3760872cea745245da992a4dad12d1 freevo-1.5.4-r2.ebuild 5656
-EBUILD freevo-1.5.4.ebuild 3159 RMD160 3dde230b0e535cdce1b31dfe7afed0ef7fdbc95a SHA1 ff025ea9d1b51d429681e53c97ec9afe4768077e SHA256 5bc5293924d12b0dd8bb52feed40893e4c006981a06faee16449e9dfb13c5415
-MD5 90917152fd84b7453badba28cb7cb815 freevo-1.5.4.ebuild 3159
-RMD160 3dde230b0e535cdce1b31dfe7afed0ef7fdbc95a freevo-1.5.4.ebuild 3159
-SHA256 5bc5293924d12b0dd8bb52feed40893e4c006981a06faee16449e9dfb13c5415 freevo-1.5.4.ebuild 3159
-EBUILD freevo-1.6.0.ebuild 5835 RMD160 21c69c69b499319a2ba3cef69a68d3fa45146203 SHA1 4fc3929b0e6e6e6a7503b3721d44559b518929cb SHA256 8a9820e0734d259850bb90748c5624e5c2d488f4a69d1e0d9b5a556d77833498
-MD5 04fc466736b2df4889a7ccf108d54ec9 freevo-1.6.0.ebuild 5835
-RMD160 21c69c69b499319a2ba3cef69a68d3fa45146203 freevo-1.6.0.ebuild 5835
-SHA256 8a9820e0734d259850bb90748c5624e5c2d488f4a69d1e0d9b5a556d77833498 freevo-1.6.0.ebuild 5835
-EBUILD freevo-1.6.1.ebuild 6025 RMD160 4be08c5505fec588c4ae7f157f8ed0310824307d SHA1 269aeea39ea601e6afb5a296447ef0a8fb745101 SHA256 98f31310c688872f91e0a32364a8faaa31ff8418d51ce55a9311034e9cab6b4f
-MD5 3e0e4565e5615fe98ab8e7e53019a6e9 freevo-1.6.1.ebuild 6025
-RMD160 4be08c5505fec588c4ae7f157f8ed0310824307d freevo-1.6.1.ebuild 6025
-SHA256 98f31310c688872f91e0a32364a8faaa31ff8418d51ce55a9311034e9cab6b4f freevo-1.6.1.ebuild 6025
-MISC ChangeLog 7050 RMD160 9404745c7cefc65cf34c4a6fa18e4ae7818c500b SHA1 a37107e615b8a4217c335fd1051a162ece0f3f20 SHA256 f95a0f31b0b5f88da52728a14dc875bcdc94c2ab17fc44c1b29f96d96809e2f6
-MD5 554249f1960dfa98e786c265a331bef9 ChangeLog 7050
-RMD160 9404745c7cefc65cf34c4a6fa18e4ae7818c500b ChangeLog 7050
-SHA256 f95a0f31b0b5f88da52728a14dc875bcdc94c2ab17fc44c1b29f96d96809e2f6 ChangeLog 7050
+EBUILD freevo-1.5.4-r2.ebuild 5647 RMD160 bbf62f4106a821e357cba4e0776dfb8a588c55bf SHA1 1b54033840da4360d80fcf926d0d33419704a029 SHA256 709e1844ca4baf5a7d6081d323ccc7c63ab59fa295d7c83dff182bfc338a5ed3
+MD5 7fb4c5aaf1c347dd312d75ed82f0bb4d freevo-1.5.4-r2.ebuild 5647
+RMD160 bbf62f4106a821e357cba4e0776dfb8a588c55bf freevo-1.5.4-r2.ebuild 5647
+SHA256 709e1844ca4baf5a7d6081d323ccc7c63ab59fa295d7c83dff182bfc338a5ed3 freevo-1.5.4-r2.ebuild 5647
+EBUILD freevo-1.5.4.ebuild 3127 RMD160 e9c27f052f5bad29858510a11d300d957f5e119a SHA1 d4e997a3f7070443b1326271d67a3e96fceed4c4 SHA256 13bb3c217b435f985f88bd7371b5e950b4a190bcacccc0d89f72a249858adef1
+MD5 92ad31094a1b7862e0c5cd3e72f46000 freevo-1.5.4.ebuild 3127
+RMD160 e9c27f052f5bad29858510a11d300d957f5e119a freevo-1.5.4.ebuild 3127
+SHA256 13bb3c217b435f985f88bd7371b5e950b4a190bcacccc0d89f72a249858adef1 freevo-1.5.4.ebuild 3127
+EBUILD freevo-1.6.0.ebuild 5826 RMD160 7e4034d92b31137f7efc1a102696dfc916fa1261 SHA1 c9a865e13516bf21e6494781af3e72e1d41d4521 SHA256 a420523b85acdf736072afbd0c99e176e954c4cd9530b340e74eeb5a32c9adf4
+MD5 c44fc267fcfcd157ef6c9a36e162aa4a freevo-1.6.0.ebuild 5826
+RMD160 7e4034d92b31137f7efc1a102696dfc916fa1261 freevo-1.6.0.ebuild 5826
+SHA256 a420523b85acdf736072afbd0c99e176e954c4cd9530b340e74eeb5a32c9adf4 freevo-1.6.0.ebuild 5826
+EBUILD freevo-1.6.1.ebuild 6016 RMD160 fdb3101abfb195e70e93ef32ff533bc5e629e87a SHA1 600e1e957008d192212047327ba84bafb9da6497 SHA256 0d54d771ac612a03c4321804fb294097a3b41265116eaa16f846e03f263024b8
+MD5 21077458d62aa1b5f65bb8cca7fc85cf freevo-1.6.1.ebuild 6016
+RMD160 fdb3101abfb195e70e93ef32ff533bc5e629e87a freevo-1.6.1.ebuild 6016
+SHA256 0d54d771ac612a03c4321804fb294097a3b41265116eaa16f846e03f263024b8 freevo-1.6.1.ebuild 6016
+MISC ChangeLog 7253 RMD160 dac06916c6b375189916789f2ad51f98e44d1052 SHA1 346c2fce88fdb723e64cf2bbe4c71e45e1c3ed42 SHA256 71ee23e6b59a40f41ef0c3d8b3a9b75fa4d671db72f7725e2455cda489f1c6a5
+MD5 96b80e829c42b3d89719e946ad7fb50b ChangeLog 7253
+RMD160 dac06916c6b375189916789f2ad51f98e44d1052 ChangeLog 7253
+SHA256 71ee23e6b59a40f41ef0c3d8b3a9b75fa4d671db72f7725e2455cda489f1c6a5 ChangeLog 7253
 MISC metadata.xml 233 RMD160 5d16c9322e5152387c2556031b252316adc38efc SHA1 fdc56e2e7392bbe355758b93878b82d5641e6cca SHA256 1d447dc5f6d0dd31038424067fe0d236373e19f34464aedc9842daa31981d08c
 MD5 101d8e1fd628eb66d4c2817ad69d5d36 metadata.xml 233
 RMD160 5d16c9322e5152387c2556031b252316adc38efc metadata.xml 233
@@ -59,7 +59,7 @@ SHA256 bcdb212cb59903d90aba1ad0b6a7b262fd85a7d19c9903a01763e848be01085b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKo3poeSe8B0zEfwRAo1vAKCB28MXhNKt79OC74SEajX/CW3DBQCdE8oz
-EUm0Za2dZv8WMYalWR0VZz0=
-=7ak7
+iD8DBQFGK53hyuNVb5qfaOYRAu+yAKC1VZ9yBXwjniif5qg5yssjxKLyZACfQbBD
+vQw8+vKru2AOQftk7xEAKnA=
+=AVhs
 -----END PGP SIGNATURE-----
diff --git a/media-tv/freevo/freevo-1.5.4-r2.ebuild b/media-tv/freevo/freevo-1.5.4-r2.ebuild
index 17144051d5580acadc40c5e4e855107154a6fa03..61942936c7e90a00e48d6a525f3f2842a2535149 100644 (file)
--- a/media-tv/freevo/freevo-1.5.4-r2.ebuild
+++ b/media-tv/freevo/freevo-1.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4-r2.ebuild,v 1.3 2007/03/19 15:05:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4-r2.ebuild,v 1.4 2007/04/22 17:39:35 phreak Exp $
 
 inherit distutils
 
@@ -23,11 +23,11 @@ DEPEND=">=dev-python/pygame-1.5.6
        >=media-video/mplayer-0.92
        >=media-libs/freetype-2.1.4
        >=media-libs/libsdl-1.2.5
-       >=sys-apps/sed-4
        dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
        encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
        matrox? ( >=media-video/matroxset-0.3 )
        lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        if ! built_with_use media-libs/sdl-image png; then
@@ -56,7 +56,7 @@ src_install() {
 
        if [ "${PROFILE_ARCH}" == "xbox" ]; then
                sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" ${D}/etc/freevo/local_conf.py
-               newins ${FILESDIR}/xbox-lircrc lircrc
+               newins "${FILESDIR}"/xbox-lircrc lircrc
        fi
 
        if use X; then
@@ -70,18 +70,17 @@ src_install() {
                        FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
                        if [ "x${FREEVOSESSION}" != "x" ]; then
                                insinto ${FREEVOSESSION}
-                               doins ${FILESDIR}/freevo.desktop freevo.desktop
+                               doins "${FILESDIR}"/freevo.desktop freevo.desktop
                        fi
                fi
 
                insinto /etc/X11/dm/Sessions
-               doins ${FILESDIR}/freevo.desktop freevo.desktop
+               doins "${FILESDIR}"/freevo.desktop freevo.desktop
        fi
 
        exeinto /usr/bin
        newexe "${FILESDIR}/freevo.boot" freevoboot
-       insinto /etc/conf.d
-       newins "${FILESDIR}/freevo.conf" freevo
+       newconfd "${FILESDIR}/freevo.conf" freevo
 
        rm -rf "${D}/usr/share/doc"
        newdoc Docs/README README.docs
@@ -89,7 +88,7 @@ src_install() {
                Docs/{CREDITS,NOTES,plugins/*.txt}
        cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
 
-       use nls || rm -rf ${D}/usr/share/locale
+       use nls || rm -rf "${D}"/usr/share/locale
 }
 
 pkg_postinst() {
diff --git a/media-tv/freevo/freevo-1.5.4.ebuild b/media-tv/freevo/freevo-1.5.4.ebuild
index 4e9a6a7dfd220e7d43d195b5b69bdaea12d11a8b..ee19e5ad223a2162fe3aeb4aac885492ffa90da4 100644 (file)
--- a/media-tv/freevo/freevo-1.5.4.ebuild
+++ b/media-tv/freevo/freevo-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4.ebuild,v 1.8 2007/03/19 15:05:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4.ebuild,v 1.9 2007/04/22 17:39:35 phreak Exp $
 
 inherit distutils
 
@@ -23,11 +23,11 @@ DEPEND=">=dev-python/pygame-1.5.6
        >=media-video/mplayer-0.92
        >=media-libs/freetype-2.1.4
        >=media-libs/libsdl-1.2.5
-       >=sys-apps/sed-4
        dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
        encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
        matrox? ( >=media-video/matroxset-0.3 )
        lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        if ! built_with_use media-libs/sdl-image png; then
@@ -46,13 +46,11 @@ src_install() {
 
        if [ "${PROFILE_ARCH}" == "xbox" ]; then
                sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" ${D}/etc/freevo/local_conf.py
-               newins ${FILESDIR}/xbox-lircrc lircrc
+               newins "${FILESDIR}"/xbox-lircrc lircrc
        fi
 
-       exeinto /etc/init.d
-       newexe "${FILESDIR}/freevo.rc6" freevo
-       insinto /etc/conf.d
-       newins "${FILESDIR}/freevo.conf" freevo
+       newinitd "${FILESDIR}/freevo.rc6" freevo
+       newconfd "${FILESDIR}/freevo.conf" freevo
 
        rm -rf "${D}/usr/share/doc"
        newdoc Docs/README README.docs
@@ -60,7 +58,7 @@ src_install() {
                Docs/{CREDITS,NOTES,plugins/*.txt}
        cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
 
-       use nls || rm -rf ${D}/usr/share/locale
+       use nls || rm -rf "${D}"/usr/share/locale
 }
 
 pkg_postinst() {
diff --git a/media-tv/freevo/freevo-1.6.0.ebuild b/media-tv/freevo/freevo-1.6.0.ebuild
index 65fd9c8c5072b1fd0dddf7fd3df2e5f7ee1b18cc..e4bcc62d0125835e8c81e2dd317972f89a564e02 100644 (file)
--- a/media-tv/freevo/freevo-1.6.0.ebuild
+++ b/media-tv/freevo/freevo-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.0.ebuild,v 1.4 2007/03/19 15:05:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.0.ebuild,v 1.5 2007/04/22 17:39:35 phreak Exp $
 
 inherit distutils
 
@@ -23,12 +23,12 @@ DEPEND=">=dev-python/pygame-1.5.6
        >=media-video/mplayer-0.92
        >=media-libs/freetype-2.1.4
        >=media-libs/libsdl-1.2.5
-       >=sys-apps/sed-4
        dev-python/elementtree
        dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
        encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
        matrox? ( >=media-video/matroxset-0.3 )
        lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        if ! built_with_use media-libs/sdl-image png; then
@@ -57,7 +57,7 @@ src_install() {
 
        if [ "${PROFILE_ARCH}" == "xbox" ]; then
                sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" ${D}/etc/freevo/local_conf.py
-               newins ${FILESDIR}/xbox-lircrc lircrc
+               newins "${FILESDIR}"/xbox-lircrc lircrc
        fi
 
        if use X; then
@@ -71,18 +71,17 @@ src_install() {
                        FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
                        if [ "x${FREEVOSESSION}" != "x" ]; then
                                insinto ${FREEVOSESSION}
-                               doins ${FILESDIR}/freevo.desktop freevo.desktop
+                               doins "${FILESDIR}"/freevo.desktop freevo.desktop
                        fi
                fi
 
                insinto /etc/X11/dm/Sessions
-               doins ${FILESDIR}/freevo.desktop freevo.desktop
+               doins "${FILESDIR}"/freevo.desktop freevo.desktop
        fi
 
        exeinto /usr/bin
        newexe "${FILESDIR}/freevo.boot" freevoboot
-       insinto /etc/conf.d
-       newins "${FILESDIR}/freevo.conf" freevo
+       newconfd "${FILESDIR}/freevo.conf" freevo
 
        rm -rf "${D}/usr/share/doc"
        newdoc Docs/README README.docs
@@ -90,7 +89,7 @@ src_install() {
                Docs/{CREDITS,NOTES,plugins/*.txt}
        cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
 
-       use nls || rm -rf ${D}/usr/share/locale
+       use nls || rm -rf "${D}"/usr/share/locale
 }
 
 pkg_postinst() {
diff --git a/media-tv/freevo/freevo-1.6.1.ebuild b/media-tv/freevo/freevo-1.6.1.ebuild
index 1c80f750bd8755f0af61e4b5cbc6e507c0fbdd49..4225dc314d7614ef91d60a2a543f8221d426f279 100644 (file)
--- a/media-tv/freevo/freevo-1.6.1.ebuild
+++ b/media-tv/freevo/freevo-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.1.ebuild,v 1.3 2007/03/19 15:05:41 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.1.ebuild,v 1.4 2007/04/22 17:39:35 phreak Exp $
 
 inherit distutils
 
@@ -23,12 +23,12 @@ DEPEND=">=dev-python/pygame-1.5.6
        >=media-video/mplayer-0.92
        >=media-libs/freetype-2.1.4
        >=media-libs/libsdl-1.2.5
-       >=sys-apps/sed-4
        dev-python/elementtree
        dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
        encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
        matrox? ( >=media-video/matroxset-0.3 )
        lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        if ! built_with_use media-libs/sdl-image png; then
@@ -57,7 +57,7 @@ src_install() {
 
        if [ "${PROFILE_ARCH}" == "xbox" ]; then
                sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" ${D}/etc/freevo/local_conf.py
-               newins ${FILESDIR}/xbox-lircrc lircrc
+               newins "${FILESDIR}"/xbox-lircrc lircrc
        fi
 
        if use X; then
@@ -71,18 +71,17 @@ src_install() {
                        FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
                        if [ "x${FREEVOSESSION}" != "x" ]; then
                                insinto ${FREEVOSESSION}
-                               doins ${FILESDIR}/freevo.desktop freevo.desktop
+                               doins "${FILESDIR}"/freevo.desktop freevo.desktop
                        fi
                fi
 
                insinto /etc/X11/dm/Sessions
-               doins ${FILESDIR}/freevo.desktop freevo.desktop
+               doins "${FILESDIR}"/freevo.desktop freevo.desktop
        fi
 
        exeinto /usr/bin
        newexe "${FILESDIR}/freevo.boot" freevoboot
-       insinto /etc/conf.d
-       newins "${FILESDIR}/freevo.conf" freevo
+       newconfd "${FILESDIR}/freevo.conf" freevo
 
        rm -rf "${D}/usr/share/doc"
        newdoc Docs/README README.docs
@@ -90,7 +89,7 @@ src_install() {
                Docs/{CREDITS,NOTES,plugins/*.txt}
        cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
 
-       use nls || rm -rf ${D}/usr/share/locale
+       use nls || rm -rf "${D}"/usr/share/locale
 }
 
 pkg_postinst() {
Unnamed repository; edit this file 'description' to name the repository.