Magellan Linux

Diff of /trunk/include/pypi.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 29841 by niro, Mon Oct 16 09:21:22 2017 UTC revision 30182 by niro, Thu Nov 2 13:14:58 2017 UTC
# Line 32  then Line 32  then
32   eval "split_info_python2-${SPLIT_PNAME}()   eval "split_info_python2-${SPLIT_PNAME}()
33   {   {
34   DEPEND=\"\${DEPEND}   DEPEND=\"\${DEPEND}
35     \${PYTHON2_DEPEND}
36   >= dev-lang/python2-2.7\"   >= dev-lang/python2-2.7\"
37   }"   }"
38    
39   eval "split_info_python3-${SPLIT_PNAME}()   eval "split_info_python3-${SPLIT_PNAME}()
40   {   {
41   DEPEND=\"\${DEPEND}   DEPEND=\"\${DEPEND}
42     \${PYTHON3_DEPEND}
43   >= dev-lang/python3-3.6\"   >= dev-lang/python3-3.6\"
44   }"   }"
45    
# Line 48  fi Line 50  fi
50    
51  SRC_URI=(  SRC_URI=(
52   ${SRC_URI[*]}   ${SRC_URI[*]}
53   https://pypi.python.org/packages/source/${PYPI_MODULE:0:1}/${PYPI_MODULE}/${SRCFILE}   https://pypi.io/packages/source/${PYPI_MODULE:0:1}/${PYPI_MODULE}/${SRCFILE}
54     #https://pypi.python.org/packages/source/${PYPI_MODULE:0:1}/${PYPI_MODULE}/${SRCFILE}
55   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
56  )  )
57    
# Line 66  pypi_src_prepare() Line 69  pypi_src_prepare()
69   fi   fi
70  }  }
71    
72    pypi_multilib_src_prepare()
73    {
74     if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
75     then
76     python2_multilib_src_prepare || die
77     python3_multilib_src_prepare || die
78     else
79     python_multilib_src_prepare || die
80     fi
81    }
82    
83  pypi_src_compile()  pypi_src_compile()
84  {  {
85   local configure_opts="$@"   local configure_opts="$@"
# Line 79  pypi_src_compile() Line 93  pypi_src_compile()
93   fi   fi
94  }  }
95    
96    pypi_multilib_src_compile()
97    {
98     local configure_opts="$@"
99    
100     if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
101     then
102     python2_multilib_src_compile ${configure_opts} || die
103     python3_multilib_src_compile ${configure_opts} || die
104     else
105     python_multilib_src_compile ${configure_opts} || die
106     fi
107    }
108    
109  pypi_src_install()  pypi_src_install()
110  {  {
111   python_src_install || die   python_src_install || die
# Line 94  eval "pypi_src_install_python3-${SPLIT_P Line 121  eval "pypi_src_install_python3-${SPLIT_P
121   python3_src_install || die   python3_src_install || die
122  }"  }"
123    
 pypi_multilib_src_compile()  
 {  
  local configure_opts="$@"  
  python_multilib_src_compile ${configure_opts} || die  
   
 }  
   
 pypi_multilib_python2_src_compile()  
 {  
  local configure_opts="$@"  
   
  if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]  
  then  
  python2_multilib_src_compile ${configure_opts} || die  
  python3_multilib_src_compile ${configure_opts} || die  
  else  
  python_multilib_src_compile ${configure_opts} || die  
  fi  
 }  
   
124  pypi_multilib_src_install()  pypi_multilib_src_install()
125  {  {
126   python_multilib_src_install || die   python_multilib_src_install || die
# Line 129  eval "pypi_multilib_src_install_python3- Line 136  eval "pypi_multilib_src_install_python3-
136   python3_multilib_src_install || die   python3_multilib_src_install || die
137  }"  }"
138    
 export_inherits pypi src_prepare  
139  if [[ ${MULTILIB_BUILD} = true ]]  if [[ ${MULTILIB_BUILD} = true ]]
140  then  then
141   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
142   then   then
143   export_inherits pypi_multilib src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}   export_inherits pypi_multilib src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
144   else   else
145   export_inherits pypi_multilib src_compile src_install   export_inherits pypi_multilib src_prepare src_compile src_install
146   fi   fi
147  else  else
148   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]   if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
149   then   then
150   export_inherits pypi src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}   export_inherits pypi src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
151   else   else
152   export_inherits pypi src_compile src_install   export_inherits pypi src_prepare src_compile src_install
153   fi   fi
154  fi  fi

Legend:
Removed from v.29841  
changed lines
  Added in v.30182