浏览代码

Removed ARJ, LHA, JBIG and JPEG2K support

Maxim Kammerer 11 年之前
父节点
当前提交
0ed039bb9c
共有 3 个文件被更改,包括 3 次插入9 次删除
  1. 3 4
      src/etc/portage/make.conf
  2. 0 3
      src/etc/portage/package.env
  3. 0 2
      src/etc/portage/sets/basic

+ 3 - 4
src/etc/portage/make.conf

@@ -23,8 +23,8 @@ MAKEOPTS="-j3"
 
 
 # USE flags (aggregative)
 # USE flags (aggregative)
 USE="aac alsa apng bluetooth caps cdda cjk consolekit dbus dhcp dmi eap-sim
 USE="aac alsa apng bluetooth caps cdda cjk consolekit dbus dhcp dmi eap-sim
-     eap-tls expat flac gmp gpm gtk gtkspell id3tag idn iproute2 jbig jpeg
-     jpeg2k lcms libcanberra libnotify lzma m17n-lib mad mbim mktemp mmx mmxext
+     eap-tls expat flac gmp gpm gtk gtkspell id3tag idn iproute2 jpeg
+     lcms libcanberra libnotify lzma m17n-lib mad mbim mktemp mmx mmxext
      modemmanager mp3 multicall netlink ntfsdecrypt ogg pcmcia pkcs11 png
      modemmanager mp3 multicall netlink ntfsdecrypt ogg pcmcia pkcs11 png
      policykit scsi smartcard smime sndfile spell sse sse2 startup-notification
      policykit scsi smartcard smime sndfile spell sse sse2 startup-notification
      staticsocket svg symlink threads tiff truetype udev uuid usb v4l vorbis
      staticsocket svg symlink threads tiff truetype udev uuid usb v4l vorbis
@@ -76,7 +76,6 @@ DONT_MOUNT_BOOT=1
 # /usr/portage/{licenses,profiles/license_groups}
 # /usr/portage/{licenses,profiles/license_groups}
 # FREE                        = FSF-APPROVED + OSI-APPROVED + MISC-FREE + FREE-DOCUMENTS
 # FREE                        = FSF-APPROVED + OSI-APPROVED + MISC-FREE + FREE-DOCUMENTS
 # freedist                    = unrestricted distribution
 # freedist                    = unrestricted distribution
-# lha                         = unrestricted distribution via network
 # unRAR                       = unrestricted distribution w/o reverse engineering
 # unRAR                       = unrestricted distribution w/o reverse engineering
 # BINARY-REDISTRIBUTABLE      = unrestricted distribution in binary form
 # BINARY-REDISTRIBUTABLE      = unrestricted distribution in binary form
 # myspell-ru_RU-ALexanderLebedev = unrestricted distribution in unmodified / binary form
 # myspell-ru_RU-ALexanderLebedev = unrestricted distribution in unmodified / binary form
@@ -84,7 +83,7 @@ DONT_MOUNT_BOOT=1
 # bluez-firmware              = distribution by BlueZ project
 # bluez-firmware              = distribution by BlueZ project
 # PUEL                        = personal license (build-time virtualbox-bin)
 # PUEL                        = personal license (build-time virtualbox-bin)
 # CC-BY-*, all-rights-res.    = claws-mail-themes (pruned except for Gnome (GPL-v3))
 # CC-BY-*, all-rights-res.    = claws-mail-themes (pruned except for Gnome (GPL-v3))
-ACCEPT_LICENSE="-* @FREE freedist unRAR lha @BINARY-REDISTRIBUTABLE Atmel
+ACCEPT_LICENSE="-* @FREE freedist unRAR @BINARY-REDISTRIBUTABLE Atmel
                    myspell-ru_RU-ALexanderLebedev bluez-firmware PUEL
                    myspell-ru_RU-ALexanderLebedev bluez-firmware PUEL
                    CC-BY-NC-SA-3.0 CC-BY-ND-3.0 all-rights-reserved"
                    CC-BY-NC-SA-3.0 CC-BY-ND-3.0 all-rights-reserved"
 
 

+ 0 - 3
src/etc/portage/package.env

@@ -1,5 +1,2 @@
 # (#481372)
 # (#481372)
 x11-libs/gdk-pixbuf nopmake.conf
 x11-libs/gdk-pixbuf nopmake.conf
-
-# (#521818)
-app-arch/arj        nopmake.conf

+ 0 - 2
src/etc/portage/sets/basic

@@ -17,8 +17,6 @@ app-arch/pbzip2
 app-arch/zip
 app-arch/zip
 app-arch/p7zip
 app-arch/p7zip
 app-arch/unrar
 app-arch/unrar
-app-arch/arj
-app-arch/lha
 sys-fs/inotify-tools
 sys-fs/inotify-tools
 sys-fs/ntfs3g
 sys-fs/ntfs3g
 sys-fs/dosfstools
 sys-fs/dosfstools